projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| f34f3dc1 GKH |
1 | From 6984f3c31bb57cb7491dbec1be44b74bd00f4648 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chris Ball <cjb@laptop.org> | |
| 3 | Date: Mon, 3 Dec 2012 09:17:19 -0500 | |
| 4 | Subject: Revert misapplied "mmc: sh-mmcif: avoid oops on spurious interrupts" | |
| 5 | ||
| 6 | From: Chris Ball <cjb@laptop.org> | |
| 7 | ||
| 8 | commit 6984f3c31bb57cb7491dbec1be44b74bd00f4648 upstream. | |
| 9 | ||
| 10 | This reverts commit 8464dd52d3198dd05, which was a misapplied debugging | |
| 11 | version of the patch, not the final patch itself. | |
| 12 | ||
| 13 | Signed-off-by: Chris Ball <cjb@laptop.org> | |
| 14 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 15 | ||
| 16 | --- | |
| 17 | drivers/mmc/host/sh_mmcif.c | 4 ---- | |
| 18 | 1 file changed, 4 deletions(-) | |
| 19 | ||
| 20 | --- a/drivers/mmc/host/sh_mmcif.c | |
| 21 | +++ b/drivers/mmc/host/sh_mmcif.c | |
| 22 | @@ -1191,10 +1191,6 @@ static irqreturn_t sh_mmcif_intr(int irq | |
| 23 | host->sd_error = true; | |
| 24 | dev_dbg(&host->pd->dev, "int err state = %08x\n", state); | |
| 25 | } | |
| 26 | - if (host->state == STATE_IDLE) { | |
| 27 | - dev_info(&host->pd->dev, "Spurious IRQ status 0x%x", state); | |
| 28 | - return IRQ_HANDLED; | |
| 29 | - } | |
| 30 | if (state & ~(INT_CMD12RBE | INT_CMD12CRE)) { | |
| 31 | if (!host->dma_active) | |
| 32 | return IRQ_WAKE_THREAD; |