Commit 44b61a9f authored by Sachin Kamat's avatar Sachin Kamat Committed by Lee Jones

mfd: asic3: Fix potential null pointer dereference

We previously assumed 'mem_sdio' could be null but it is
dereferenced in ioremap(). Add a check to avoid a potential
null pointer dereference error.
Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 96758059
...@@ -899,6 +899,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ...@@ -899,6 +899,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
ds1wm_resources[0].end >>= asic->bus_shift; ds1wm_resources[0].end >>= asic->bus_shift;
/* MMC */ /* MMC */
if (mem_sdio) {
asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) + asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) +
mem_sdio->start, mem_sdio->start,
ASIC3_SD_CONFIG_SIZE >> asic->bus_shift); ASIC3_SD_CONFIG_SIZE >> asic->bus_shift);
...@@ -907,6 +908,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, ...@@ -907,6 +908,7 @@ static int __init asic3_mfd_probe(struct platform_device *pdev,
dev_dbg(asic->dev, "Couldn't ioremap SD_CONFIG\n"); dev_dbg(asic->dev, "Couldn't ioremap SD_CONFIG\n");
goto out; goto out;
} }
}
asic3_mmc_resources[0].start >>= asic->bus_shift; asic3_mmc_resources[0].start >>= asic->bus_shift;
asic3_mmc_resources[0].end >>= asic->bus_shift; asic3_mmc_resources[0].end >>= asic->bus_shift;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment