浏览代码

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()
Linus Torvalds 15 年之前
父节点
当前提交
11bfe2ea73
共有 1 个文件被更改,包括 1 次插入3 次删除
  1. 1 3
      drivers/mmc/host/msm_sdcc.c

+ 1 - 3
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;