RFC: mmc: dw_mmc: Don't clear errors we aren't handling

PATCH New Doug Anderson 1 participant 1 message Mar 15, 2013

Subsystems (2)

MMC, SD and SDIO Synopsys DesignWare MMC/SD/SDIO driver

lore

Share & tools

lore

Doug Anderson

author

2013-03-15 21:30 UTC #0 lore raw

PATCH 1/1 RFC: mmc: dw_mmc: Don't clear errors we aren't handling

Although there are no known cases of this being a problem (and it may be technically impossible for the hardware to report more errors once already in the error state), it seems unwise for us to be clearing error interrupts that we didn't actually read.

Signed-off-by Doug Anderson <[email protected]>

---
 drivers/mmc/host/dw_mmc.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/mmc/host/dw_mmc.c +4 -2

index 9834221..84ae704 100644
@@ -1583,7 +1583,8 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 			break;
 
 		if (pending & DW_MCI_CMD_ERROR_FLAGS) {
-			mci_writel(host, RINTSTS, DW_MCI_CMD_ERROR_FLAGS);
+			mci_writel(host, RINTSTS,
+				   pending & DW_MCI_CMD_ERROR_FLAGS);
 			host->cmd_status = pending;
 			smp_wmb();
 			set_bit(EVENT_CMD_COMPLETE, &host->pending_events);

@@ -1591,7 +1592,8 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
 
 		if (pending & DW_MCI_DATA_ERROR_FLAGS) {
 			/* if there is an error report DATA_ERROR */
-			mci_writel(host, RINTSTS, DW_MCI_DATA_ERROR_FLAGS);
+			mci_writel(host, RINTSTS,
+				   pending & DW_MCI_DATA_ERROR_FLAGS);
 			host->data_status = pending;
 			smp_wmb();
 			set_bit(EVENT_DATA_ERROR, &host->pending_events);

Signature · 1 line

1.8.1.3