Commit b03aec1c authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Ulf Hansson
Browse files

mmc: uniphier-sd: Fix an error handling path in uniphier_sd_probe() 



A 'uniphier_sd_clk_enable()' call should be balanced by a corresponding
'uniphier_sd_clk_disable()' call.
This is done in the remove function, but not in the error handling path of
the probe.

Add the missing call.

Fixes: 3fd784f7 ("mmc: uniphier-sd: add UniPhier SD/eMMC controller driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20210220142935.918554-1-christophe.jaillet@wanadoo.fr


Cc: stable@vger.kernel.org
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c29b84d6

drivers/mmc/host/uniphier-sd.c

+3 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ static int uniphier_sd_probe(struct platform_device *pdev) 


	ret = tmio_mmc_host_probe(host);

	if (ret)

		goto free_host;

		goto disable_clk;



	ret = devm_request_irq(dev, irq, tmio_mmc_irq, IRQF_SHARED,

			       dev_name(dev), host);
@@ -646,6 +646,8 @@ static int uniphier_sd_probe(struct platform_device *pdev) 


remove_host:

	tmio_mmc_host_remove(host);

disable_clk:

	uniphier_sd_clk_disable(host);

free_host:

	tmio_mmc_host_free(host);