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

Commit c3fc6e9b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents f98d2d16 d49beb9a

drivers/mmc/host/sdhci-msm.c

+3 −1
Original line number Diff line number Diff line
@@ -3895,8 +3895,10 @@ 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

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

}



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

include/linux/mmc/sdhci.h

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

};

#endif /* LINUX_MMC_SDHCI_H */