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

Commit 329f2237 authored by Tanmay Upadhyay's avatar Tanmay Upadhyay Committed by Chris Ball
Browse files

mmc: sdhci-pxa: Check pdata before using its members 



Signed-off-by: default avatarTanmay Upadhyay <tanmay.upadhyay@einfochips.com>
Acked-by: default avatarZhangfei Gao <zhangfei.gao@marvell.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 7f7e4129

drivers/mmc/host/sdhci-pxav2.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static void pxav2_set_private_registers(struct sdhci_host *host, u8 mask) 
		 * tune timing of read data/command when crc error happen

		 * no performance impact

		 */

		if (pdata->clk_delay_sel == 1) {

		if (pdata && pdata->clk_delay_sel == 1) {

			tmp = readw(host->ioaddr + SD_CLOCK_BURST_SIZE_SETUP);



			tmp &= ~(SDCLK_DELAY_MASK << SDCLK_DELAY_SHIFT);
@@ -71,7 +71,7 @@ static void pxav2_set_private_registers(struct sdhci_host *host, u8 mask) 
			writew(tmp, host->ioaddr + SD_CLOCK_BURST_SIZE_SETUP);

		}



		if (pdata->flags & PXA_FLAG_ENABLE_CLOCK_GATING) {

		if (pdata && (pdata->flags & PXA_FLAG_ENABLE_CLOCK_GATING)) {

			tmp = readw(host->ioaddr + SD_FIFO_PARAM);

			tmp &= ~CLK_GATE_SETTING_BITS;

			writew(tmp, host->ioaddr + SD_FIFO_PARAM);