summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 16:21:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 16:21:24 -0800
commit11bfe2ea732c6499c46c4f3a63d567c05b9dbafd (patch)
treefc35e4a171eba06910b60652ae0f8c1e68bd86ef /drivers
parentb6fedfd2a18a489d31246312f7279f82e3cc6b37 (diff)
parent5b8a2fb34f5670b1f07483bfa40de9ce539dbdb2 (diff)
downloadlinux-11bfe2ea732c6499c46c4f3a63d567c05b9dbafd.tar.bz2
Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
* 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: msm_sdcc.c: missing brackets in msmsdcc_resume()
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/msm_sdcc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index b31946e0b4ca..4c068e5fe6b2 100644
--- 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;