Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91772
b: refs/heads/master
c: 5ec21b1
h: refs/heads/master
v: v3
  • Loading branch information
Carlos Eduardo Aguiar authored and Pierre Ossman committed Apr 18, 2008
1 parent 3740f67 commit 1499a9c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6fee65cfde519ae811c3cde47c622271168ca449
refs/heads/master: 5ec21b1ccf554593d25fba0f411c03e1d6fd88c5
11 changes: 3 additions & 8 deletions trunk/drivers/mmc/host/omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -495,15 +495,10 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
if (status & OMAP_MMC_STAT_CMD_TOUT) {
/* Timeouts are routine with some commands */
if (host->cmd) {
if (host->cmd->opcode != MMC_ALL_SEND_CID &&
host->cmd->opcode !=
MMC_SEND_OP_COND &&
host->cmd->opcode !=
MMC_APP_CMD &&
!mmc_omap_cover_is_open(host))
if (!mmc_omap_cover_is_open(host))
dev_err(mmc_dev(host->mmc),
"command timeout, CMD %d\n",
host->cmd->opcode);
"command timeout, CMD %d\n",
host->cmd->opcode);
host->cmd->error = -ETIMEDOUT;
end_command = 1;
}
Expand Down

0 comments on commit 1499a9c

Please sign in to comment.