]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
mmc: sdhci-pxa: Check pdata before using its members
authorTanmay Upadhyay <tanmay.upadhyay@einfochips.com>
Wed, 14 Sep 2011 05:59:02 +0000 (11:29 +0530)
committerChris Ball <cjb@laptop.org>
Wed, 26 Oct 2011 20:32:01 +0000 (16:32 -0400)
Signed-off-by: Tanmay Upadhyay <tanmay.upadhyay@einfochips.com>
Acked-by: Zhangfei Gao <zhangfei.gao@marvell.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sdhci-pxav2.c

index 38f58994f79a816e353717c8b69bdb3b409fbe0e..1114fe2f0a57db9bfc26f66cd6bda397eff18c98 100644 (file)
@@ -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);