Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fb83b14 authored by Jan Glauber's avatar Jan Glauber Committed by Ulf Hansson
Browse files

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: default avatarJan Glauber <jglauber@cavium.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c2372c20

drivers/mmc/host/cavium-octeon.c

+10 −1
Original line number Diff line number Diff line
@@ -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)

drivers/mmc/host/cavium-thunderx.c

+6 −0
Original line number Diff line number Diff line
@@ -146,6 +146,12 @@ static int thunder_mmc_probe(struct pci_dev *pdev, 
	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);

	}

	clk_disable_unprepare(host->clk);

	return ret;

}