diff options
| -rw-r--r-- | drivers/mmc/host/omap.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 90c358b57d1c..da70467915d6 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
| @@ -495,15 +495,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id) | |||
| 495 | if (status & OMAP_MMC_STAT_CMD_TOUT) { | 495 | if (status & OMAP_MMC_STAT_CMD_TOUT) { |
| 496 | /* Timeouts are routine with some commands */ | 496 | /* Timeouts are routine with some commands */ |
| 497 | if (host->cmd) { | 497 | if (host->cmd) { |
| 498 | if (host->cmd->opcode != MMC_ALL_SEND_CID && | 498 | if (!mmc_omap_cover_is_open(host)) |
| 499 | host->cmd->opcode != | ||
| 500 | MMC_SEND_OP_COND && | ||
| 501 | host->cmd->opcode != | ||
| 502 | MMC_APP_CMD && | ||
| 503 | !mmc_omap_cover_is_open(host)) | ||
| 504 | dev_err(mmc_dev(host->mmc), | 499 | dev_err(mmc_dev(host->mmc), |
| 505 | "command timeout, CMD %d\n", | 500 | "command timeout, CMD %d\n", |
| 506 | host->cmd->opcode); | 501 | host->cmd->opcode); |
| 507 | host->cmd->error = -ETIMEDOUT; | 502 | host->cmd->error = -ETIMEDOUT; |
| 508 | end_command = 1; | 503 | end_command = 1; |
| 509 | } | 504 | } |