summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorBrent Taylor <motobud@gmail.com>2016-03-13 07:25:31 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2016-03-17 14:54:41 +0100
commit93c77d2999b09f2084b033ea6489915e0104ad9c (patch)
tree899819f6c2b1a65c8881a6c83f5f1023a793a9d3 /drivers/mmc
parentmmc: core: remove redundant memset of sdio_read_cccr (diff)
downloadlinux-93c77d2999b09f2084b033ea6489915e0104ad9c.tar.xz
linux-93c77d2999b09f2084b033ea6489915e0104ad9c.zip
mmc: atmel-mci: Check pdata for NULL before dereferencing it at DMA config
Using an at91sam9g20ek development board with DTS configuration may trigger a kernel panic because of a NULL pointer dereference exception, while configuring DMA. Let's fix this by adding a check for pdata before dereferencing it. Signed-off-by: Brent Taylor <motobud@gmail.com> Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/atmel-mci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 7f9d3de9f870..9268c41a8561 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -2438,7 +2438,7 @@ static int atmci_configure_dma(struct atmel_mci *host)
struct mci_platform_data *pdata = host->pdev->dev.platform_data;
dma_cap_mask_t mask;
- if (!pdata->dma_filter)
+ if (!pdata || !pdata->dma_filter)
return -ENODEV;
dma_cap_zero(mask);