summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Ball <cjb@laptop.org>2012-12-03 15:17:19 +0100
committerChris Ball <cjb@laptop.org>2012-12-06 19:54:34 +0100
commit6984f3c31bb57cb7491dbec1be44b74bd00f4648 (patch)
tree633ffe53e6a68c77e331650a9f5b8f65cb2981ce
parentmmc: sdhci-s3c: fix missing clock for gpio card-detect (diff)
downloadlinux-6984f3c31bb57cb7491dbec1be44b74bd00f4648.tar.xz
linux-6984f3c31bb57cb7491dbec1be44b74bd00f4648.zip
Revert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts"
This reverts commit 8464dd52d3198dd05, which was a misapplied debugging version of the patch, not the final patch itself. Signed-off-by: Chris Ball <cjb@laptop.org> Cc: stable@vger.kernel.org
-rw-r--r--drivers/mmc/host/sh_mmcif.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index d25bc97dc5c6..43cd0b54db07 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1231,10 +1231,6 @@ static irqreturn_t sh_mmcif_intr(int irq, void *dev_id)
host->sd_error = true;
dev_dbg(&host->pd->dev, "int err state = %08x\n", state);
}
- if (host->state == STATE_IDLE) {
- dev_info(&host->pd->dev, "Spurious IRQ status 0x%x", state);
- return IRQ_HANDLED;
- }
if (state & ~(INT_CMD12RBE | INT_CMD12CRE)) {
if (!host->dma_active)
return IRQ_WAKE_THREAD;