diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-30 07:20:49 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-30 07:20:49 -0700 |
| commit | 5609e231ef5e822fb37ae8e5b48dce2b771f3edd (patch) | |
| tree | 6a4e986935d34cbc5b8ff28188f5485e026782d8 /drivers | |
| parent | 512f631e4051a2f8d3591a66c02b99fead27f6ee (diff) | |
| parent | 20bc1967628013610d0e30e0d4ec6a8b9384d1d9 (diff) | |
Merge "mmc: host: sdhci-msm: Skip reading GENERICS register in check_pwr_status"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 3e51c9a86250..2eaac11ec8ba 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2736,14 +2736,15 @@ static void sdhci_msm_check_power_status(struct sdhci_host *host, u32 req_type) msm_host->offset; unsigned long flags; bool done = false; - u32 io_sig_sts; + u32 io_sig_sts = SWITCHABLE_SIGNALLING_VOL; spin_lock_irqsave(&host->lock, flags); pr_debug("%s: %s: request %d curr_pwr_state %x curr_io_level %x\n", mmc_hostname(host->mmc), __func__, req_type, msm_host->curr_pwr_state, msm_host->curr_io_level); - io_sig_sts = sdhci_msm_readl_relaxed(host, - msm_host_offset->CORE_GENERICS); + if (!msm_host->mci_removed) + io_sig_sts = sdhci_msm_readl_relaxed(host, + msm_host_offset->CORE_GENERICS); /* * The IRQ for request type IO High/Low will be generated when - |