[PATCH 2/3] mmc: dw_mmc: Add a return in an unexpected cmd11 timeout
Doug Anderson
dianders at chromium.org
Fri Apr 3 11:13:06 PDT 2015
If we get an unexpected cmd11 timeout we shouldn't actually treat it
as a timeout (not that we really expect to get an unexpected cmd11
timeout, but still).
Fixes: 5c935165da79 ("mmc: dw_mmc: Add a timeout for sending CMD11")
Reported-by: Jaehoon Chung <jh80.chung at samsung.com>
Signed-off-by: Doug Anderson <dianders at chromium.org>
---
drivers/mmc/host/dw_mmc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 339a929..357ef04 100644
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2589,8 +2589,10 @@ static void dw_mci_cmd11_timer(unsigned long arg)
{
struct dw_mci *host = (struct dw_mci *)arg;
- if (host->state != STATE_SENDING_CMD11)
- dev_info(host->dev, "Unexpected CMD11 timeout\n");
+ if (host->state != STATE_SENDING_CMD11) {
+ dev_warn(host->dev, "Unexpected CMD11 timeout\n");
+ return;
+ }
host->cmd_status = SDMMC_INT_RTO;
set_bit(EVENT_CMD_COMPLETE, &host->pending_events);
--
2.2.0.rc0.207.ga3a616c
More information about the Linux-rockchip
mailing list