diff options
| author | Subhash Jadavani <subhashj@codeaurora.org> | 2015-10-16 18:33:25 -0700 |
|---|---|---|
| committer | Subhash Jadavani <subhashj@codeaurora.org> | 2016-05-31 15:27:42 -0700 |
| commit | 1cdc481924aff628fefbba895cf649a2c757edfb (patch) | |
| tree | a197b63a23aced161d3e9201dee5d643ca9e208d | |
| parent | 24c09c2fdf65cc4a4d16c3c72e27c90d31f2fe21 (diff) | |
mmc: sdhci-msm: dump cmdq debug ram only for command queue host
Currently we are printing the cmdq debug ram contents during the
error handling but this code path shouldn't be executed for non cmdq
hosts.
Change-Id: Ic397e4378c290b604037e69b7df58200810e981c
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 246a31ad539a..c4f6cdd2150c 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -2986,7 +2986,8 @@ void sdhci_msm_dump_vendor_regs(struct sdhci_host *host) u32 sts = 0; pr_info("----------- VENDOR REGISTER DUMP -----------\n"); - sdhci_msm_cmdq_dump_debug_ram(msm_host); + if (host->cq_host) + sdhci_msm_cmdq_dump_debug_ram(msm_host); pr_info("Data cnt: 0x%08x | Fifo cnt: 0x%08x | Int sts: 0x%08x\n", readl_relaxed(msm_host->core_mem + CORE_MCI_DATA_CNT), @@ -3744,11 +3745,13 @@ static void sdhci_msm_cmdq_init(struct sdhci_host *host, struct sdhci_msm_host *msm_host = pltfm_host->priv; host->cq_host = cmdq_pltfm_init(pdev); - if (IS_ERR(host->cq_host)) + if (IS_ERR(host->cq_host)) { dev_dbg(&pdev->dev, "cmdq-pltfm init: failed: %ld\n", PTR_ERR(host->cq_host)); - else + host->cq_host = NULL; + } else { msm_host->mmc->caps2 |= MMC_CAP2_CMD_QUEUE; + } } #else static void sdhci_msm_cmdq_init(struct sdhci_host *host, |