evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "mmc: sdhci: Panic after dumping SDHC registers"

Browse source 
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>
This commit is contained in:
Sayali Lokhande 2016-04-11 18:36:53 +05:30 • committed by Kyle Yan
parent aff06730c3
commit 9ed18dec09
3 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mmc/host/sdhci-msm.c
View file

@ -3955,10 +3955,8 @@ static int sdhci_msm_probe(struct platform_device *pdev)
goto pltfm_free; goto pltfm_free;
} }
if (ret <= 2) { if (ret <= 2)
sdhci_slot[ret-1] = msm_host; sdhci_slot[ret-1] = msm_host;
host->slot_no = ret;
}
msm_host->pdata = sdhci_msm_populate_pdata(&pdev->dev, msm_host->pdata = sdhci_msm_populate_pdata(&pdev->dev,
msm_host); msm_host);

2
drivers/mmc/host/sdhci.c
View file

@ -172,8 +172,6 @@ static void sdhci_dumpregs(struct sdhci_host *host)
host->ops->dump_vendor_regs(host); host->ops->dump_vendor_regs(host);
sdhci_dump_state(host); sdhci_dump_state(host);
pr_info(DRIVER_NAME ": ===========================================\n"); pr_info(DRIVER_NAME ": ===========================================\n");
if (host->slot_no == 1)
BUG_ON(1);
} }
/*****************************************************************************\ /*****************************************************************************\

2
drivers/mmc/host/sdhci.h
View file

@ -611,8 +611,6 @@ struct sdhci_host {
ktime_t reset_wa_t; /* time when the reset workaround is applied */ ktime_t reset_wa_t; /* time when the reset workaround is applied */
int reset_wa_cnt; /* total number of times workaround is used */ int reset_wa_cnt; /* total number of times workaround is used */
int slot_no;
unsigned long private[0] ____cacheline_aligned; unsigned long private[0] ____cacheline_aligned;
}; };