diff options
| author | Sayali Lokhande <sayalil@codeaurora.org> | 2016-04-11 18:36:53 +0530 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-06-13 19:06:18 -0700 |
| commit | 9ed18dec09251d8d1d177f9ab0d95f61277d7769 (patch) | |
| tree | c90ea9b86023f1ecc794d972a832cdac1b592c0c /drivers | |
| parent | aff06730c3dea8ca06a22b7ff6b7d5253e9d025c (diff) | |
Revert "mmc: sdhci: Panic after dumping SDHC registers"
This reverts 'commit d49beb9a2a71 ("mmc: sdhci: Panic
after SDHC registers")'. As CMDQ is quite stable now,
removing a BUG_ON which was added internally to crash
system on error.
Change-Id: Ie0c11743fb781e765c926e3408b87eaf94dc2eb6
Signed-off-by: Sayali Lokhande <sayalil@codeaurora.org>
[subhashj@codeaurora.org: fixed trivial merge conflicts]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index b2610be29ed4..f3cc5ed87c59 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -3955,10 +3955,8 @@ static int sdhci_msm_probe(struct platform_device *pdev) goto pltfm_free; } - if (ret <= 2) { + if (ret <= 2) sdhci_slot[ret-1] = msm_host; - host->slot_no = ret; - } msm_host->pdata = sdhci_msm_populate_pdata(&pdev->dev, msm_host); diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9beb37b4e241..34f8ae4ab105 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -172,8 +172,6 @@ static void sdhci_dumpregs(struct sdhci_host *host) host->ops->dump_vendor_regs(host); sdhci_dump_state(host); pr_info(DRIVER_NAME ": ===========================================\n"); - if (host->slot_no == 1) - BUG_ON(1); } /*****************************************************************************\ diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 9b39821b57ef..93120f17b91e 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -611,8 +611,6 @@ struct sdhci_host { ktime_t reset_wa_t; /* time when the reset workaround is applied */ int reset_wa_cnt; /* total number of times workaround is used */ - int slot_no; - unsigned long private[0] ____cacheline_aligned; }; |