Merge pull request torvalds#31 from aejsmith/ci20-v3.18-mmc

Resolve Wi-Fi stall issues
aejsmith · Jun 24, 2015 · 7324be7 · 7324be7
2 parents 58aab73 + 81065c3
commit 7324be7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/drivers/mmc/host/jz47xx_mmc.c b/drivers/mmc/host/jz47xx_mmc.c
@@ -184,17 +184,19 @@ static void jz47xx_mmc_set_irq_enabled(struct jz47xx_mmc_host *host,
 	unsigned long flags;
 
 	spin_lock_irqsave(&host->lock, flags);
+
 	if (enabled)
 		host->irq_mask &= ~irq;
 	else
 		host->irq_mask |= irq;
-	spin_unlock_irqrestore(&host->lock, flags);
 
 	/* In the 4750 onwards, IMASK is expanded to 32 bits. */
 	if (host->version >= JZ_MMC_JZ4750)
 		writel(host->irq_mask, host->base + JZ_REG_MMC_IMASK);
 	else
 		writew(host->irq_mask, host->base + JZ_REG_MMC_IMASK);
+
+	spin_unlock_irqrestore(&host->lock, flags);
 }
 
 static void jz47xx_mmc_clock_enable(struct jz47xx_mmc_host *host,