diff options
| author | merge <null@invalid> | 2008-12-04 21:19:10 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-04 21:19:10 +0000 |
| commit | f1e6e9204ab03f140abe71c701d79728ae9a0baf (patch) | |
| tree | 6c65ae3fb8927be63bac24ea69e7eb24805e5962 /drivers/mfd | |
| parent | 5430bdb92ec379dd0cd4d52d80180efc0b79e92b (diff) | |
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-workaround-glamo-mmc-insanity-1228425445
pending-tracking-hist top was MERGE-via-stable-tracking-workaround-glamo-mmc-insanity-1228425445 / 8c97326a7ad33d8690a4b433abc14918e5900e58 ... parent commitmessage:
From: merge <null@invalid>
MERGE-via-stable-tracking-hist-workaround-glamo-mmc-insanity-
stable-tracking-hist top was workaround-glamo-mmc-insanity- / 7a55cd6f948a33c4452dd99da39e15efe832f2e2 ... parent commitmessage:
From: sprite_tm <unknown@invalid>
workaround-glamo-mmc-insanity-timeout-warning-only.patch
Modified version of one line patch from
https://docs.openmoko.org/trac/ticket/2078
by sprite_tm
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 238f6b9574f..3e3ffeaff71 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -644,12 +644,8 @@ static void glamo_mci_send_request(struct mmc_host *mmc) GLAMO_STAT1_MMC_BWERR | GLAMO_STAT1_MMC_BRERR)))) && (insanity_timeout--)); - if (insanity_timeout < 0) { - cmd->error = -ETIMEDOUT; - dev_err(&host->pdev->dev, "***** insanity timeout cmd 0x%x, " - "arg 0x%x data=%p mrq->stop=%p flags 0x%x\n", - cmd->opcode, cmd->arg, cmd->data, cmd->mrq->stop, cmd->flags); - } + if (insanity_timeout < 0) + dev_info(&host->pdev->dev, "command timeout, continuing\n"); if (status & (GLAMO_STAT1_MMC_RTOUT | GLAMO_STAT1_MMC_DTOUT)) |