Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ed18dec authored by Sayali Lokhande's avatar Sayali Lokhande Committed by Kyle Yan
Browse files

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: default avatarSayali Lokhande <sayalil@codeaurora.org>
[subhashj@codeaurora.org: fixed trivial merge conflicts]
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
parent aff06730

drivers/mmc/host/sdhci-msm.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

drivers/mmc/host/sdhci.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

}



/*****************************************************************************\

drivers/mmc/host/sdhci.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

};