diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-25 10:48:21 +0100 |
|---|---|---|
| committer | Chris Ball <chris@printf.net> | 2014-02-25 21:42:52 +0100 |
| commit | eab36b2478aaed00ef381f4e855d4e0c14778a32 (patch) | |
| tree | 3db0d2587be822e117f323ef1dce50fd94532356 /drivers/mmc | |
| parent | mmc: wmt-sdmmc: Fix NULL pointer dereference (diff) | |
| download | linux-eab36b2478aaed00ef381f4e855d4e0c14778a32.tar.xz linux-eab36b2478aaed00ef381f4e855d4e0c14778a32.zip | |
mmc: sdhci-spear: Fix NULL pointer dereference
pdata could be NULL if cd_gpio = -1. Dereference pdata only
if it is not NULL.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Chris Ball <chris@printf.net>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-spear.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/mmc/host/sdhci-spear.c b/drivers/mmc/host/sdhci-spear.c index 2dba9f8d1760..76ddd89a688e 100644 --- a/drivers/mmc/host/sdhci-spear.c +++ b/drivers/mmc/host/sdhci-spear.c @@ -84,14 +84,12 @@ static struct sdhci_plat_data *sdhci_probe_config_dt(struct platform_device *pde /* If pdata is required */ if (cd_gpio != -1) { pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); - if (!pdata) { + if (!pdata) dev_err(&pdev->dev, "DT: kzalloc failed\n"); - return ERR_PTR(-ENOMEM); - } + else + pdata->card_int_gpio = cd_gpio; } - pdata->card_int_gpio = cd_gpio; - return pdata; } #else |