summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/cavium-octeon.c
diff options
context:
space:
mode:
authorJan Glauber <jglauber@cavium.com>2017-05-22 13:09:21 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2017-05-22 18:01:46 +0200
commit8fb83b142823cdd1f85f78dcf9e861e9033919f9 (patch)
treeb95b866597e850c25967f03c6f6fe687b6f041b9 /drivers/mmc/host/cavium-octeon.c
parentc2372c20425bd75a5527b3e2204059762190f6ca (diff)
downloadlinux-8fb83b142823cdd1f85f78dcf9e861e9033919f9.tar.bz2
mmc: cavium: Fix probing race with regulator
If the regulator probing is not yet finished this driver might catch a -EPROBE_DEFER. Returning after this condition did not remove the created platform device. On a repeated call to the probe function the of_platform_device_create fails. Calling of_platform_device_destroy after EPROBE_DEFER resolves this bug. Signed-off-by: Jan Glauber <jglauber@cavium.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/cavium-octeon.c')
-rw-r--r--drivers/mmc/host/cavium-octeon.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/mmc/host/cavium-octeon.c b/drivers/mmc/host/cavium-octeon.c
index cbb566377508..951d2cdd7888 100644
--- a/drivers/mmc/host/cavium-octeon.c
+++ b/drivers/mmc/host/cavium-octeon.c
@@ -288,11 +288,20 @@ static int octeon_mmc_probe(struct platform_device *pdev)
if (ret) {
dev_err(&pdev->dev, "Error populating slots\n");
octeon_mmc_set_shared_power(host, 0);
- return ret;
+ goto error;
}
i++;
}
return 0;
+
+error:
+ for (i = 0; i < CAVIUM_MAX_MMC; i++) {
+ if (host->slot[i])
+ cvm_mmc_of_slot_remove(host->slot[i]);
+ if (host->slot_pdev[i])
+ of_platform_device_destroy(&host->slot_pdev[i]->dev, NULL);
+ }
+ return ret;
}
static int octeon_mmc_remove(struct platform_device *pdev)