diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 11:09:18 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 11:09:18 +1100 |
| commit | beb3d63a1a2ec283e93a11718979c310fbaadf5c (patch) | |
| tree | ef9366dd4f50789c6ab4206a743f07997e56e0ab /drivers/mmc | |
| parent | 46fe946c096659822668ba9c42293cf6f5896df9 (diff) | |
| parent | d99c6ab416c69b1788ac1ad5288dd86e776225ae (diff) | |
Merge remote branch 'msm/for-next'
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; |