dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

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

Browse source 
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>
This commit is contained in:
Tanmay Upadhyay 2011-09-14 11:29:02 +05:30 committed by Chris Ball
parent 7f7e4129c2
commit 329f223714
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/mmc/host/sdhci-pxav2.c
View 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 * tune timing of read data/command when crc error happen
* no performance impact * 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 = readw(host->ioaddr + SD_CLOCK_BURST_SIZE_SETUP);
tmp &= ~(SDCLK_DELAY_MASK << SDCLK_DELAY_SHIFT); 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); 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 = readw(host->ioaddr + SD_FIFO_PARAM);
tmp &= ~CLK_GATE_SETTING_BITS; tmp &= ~CLK_GATE_SETTING_BITS;
writew(tmp, host->ioaddr + SD_FIFO_PARAM); writew(tmp, host->ioaddr + SD_FIFO_PARAM);