From 371376cd93270bcb1a08ea79cbb8a2d632856aa4 Mon Sep 17 00:00:00 2001 From: "Bao D. Nguyen" Date: Wed, 20 May 2020 15:58:51 -0700 Subject: [PATCH] mmc: sdhci-msm: Ensure SD card power isn't ON when card removed Make sure SD card power is not enabled when the card is being removed. Change-Id: I65c0d9e134010e6da04343b5c90725ad069e242a Signed-off-by: Bao D. Nguyen --- drivers/mmc/host/sdhci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 8f29d6d15a94..8af00c6ee7c2 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2098,7 +2098,7 @@ static void sdhci_msm_handle_pwr_irq(struct sdhci_host *host, int irq) udelay(10); } - if (mmc->ops->get_cd && !mmc->ops->get_cd(mmc) && + if (mmc->card && mmc->ops->get_cd && !mmc->ops->get_cd(mmc) && irq_status & CORE_PWRCTL_BUS_ON) { irq_ack = CORE_PWRCTL_BUS_FAIL; msm_host_writel(msm_host, irq_ack, host,