Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalk…

…er/linux-msm * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: msm_sdcc.c: missing brackets in msmsdcc_resume()
git-mirror · Mar 13, 2010 · 11bfe2e · 11bfe2e
2 parents b6fedfd + 5b8a2fb
commit 11bfe2e
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
@@ -1250,9 +1250,7 @@ msmsdcc_resume(struct platform_device *dev)
 
 		if (mmc->card && mmc->card->type != MMC_TYPE_SDIO)
 			mmc_resume_host(mmc);
-			if (host->stat_irq)
-				enable_irq(host->stat_irq);
-		else if (host->stat_irq)
+		if (host->stat_irq)
 			enable_irq(host->stat_irq);
 	}
 	return 0;