diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 01:21:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 01:21:24 +0100 |
| commit | 11bfe2ea732c6499c46c4f3a63d567c05b9dbafd (patch) | |
| tree | fc35e4a171eba06910b60652ae0f8c1e68bd86ef /drivers/mmc | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff) | |
| parent | msm_sdcc.c: missing brackets in msmsdcc_resume() (diff) | |
| download | linux-11bfe2ea732c6499c46c4f3a63d567c05b9dbafd.tar.xz linux-11bfe2ea732c6499c46c4f3a63d567c05b9dbafd.zip | |
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/mmc')
| -rw-r--r-- | drivers/mmc/host/msm_sdcc.c | 4 |
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; |