| From 6984f3c31bb57cb7491dbec1be44b74bd00f4648 Mon Sep 17 00:00:00 2001 |
| From: Chris Ball <cjb@laptop.org> |
| Date: Mon, 3 Dec 2012 09:17:19 -0500 |
| Subject: Revert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts" |
| |
| From: Chris Ball <cjb@laptop.org> |
| |
| commit 6984f3c31bb57cb7491dbec1be44b74bd00f4648 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/mmc/host/sh_mmcif.c | 4 ---- |
| 1 file changed, 4 deletions(-) |
| |
| --- a/drivers/mmc/host/sh_mmcif.c |
| +++ b/drivers/mmc/host/sh_mmcif.c |
| @@ -1229,10 +1229,6 @@ static irqreturn_t sh_mmcif_intr(int irq |
| 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; |
