Bladeren bron

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>
Sachin Kamat 12 jaren geleden
bovenliggende
commit
eab36b2478
1 gewijzigde bestanden met toevoegingen van 3 en 5 verwijderingen
  1. 3 5
      drivers/mmc/host/sdhci-spear.c

+ 3 - 5
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 pdata is required */
 	if (cd_gpio != -1) {
 	if (cd_gpio != -1) {
 		pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
 		pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-		if (!pdata) {
+		if (!pdata)
 			dev_err(&pdev->dev, "DT: kzalloc failed\n");
 			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;
 	return pdata;
 }
 }
 #else
 #else