This is a note to let you know that I've just added the patch titled mmc: uniphier-sd: Fix an error handling path in uniphier_sd_probe() to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mmc-uniphier-sd-fix-an-error-handling-path-in-uniphier_sd_probe.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From b03aec1c1f337dfdae44cdb0645ecac34208ae0a Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> Date: Sat, 20 Feb 2021 15:29:35 +0100 Subject: mmc: uniphier-sd: Fix an error handling path in uniphier_sd_probe() From: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> commit b03aec1c1f337dfdae44cdb0645ecac34208ae0a upstream. 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: 3fd784f745dd ("mmc: uniphier-sd: add UniPhier SD/eMMC controller driver") Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx> Reviewed-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> Link: https://lore.kernel.org/r/20210220142935.918554-1-christophe.jaillet@xxxxxxxxxx Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/mmc/host/uniphier-sd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -639,7 +639,7 @@ static int uniphier_sd_probe(struct plat 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); @@ -650,6 +650,8 @@ static int uniphier_sd_probe(struct plat remove_host: tmio_mmc_host_remove(host); +disable_clk: + uniphier_sd_clk_disable(host); free_host: tmio_mmc_host_free(host); Patches currently in stable-queue which might be from christophe.jaillet@xxxxxxxxxx are queue-5.4/mmc-uniphier-sd-fix-a-resource-leak-in-the-remove-function.patch queue-5.4/mmc-uniphier-sd-fix-an-error-handling-path-in-uniphier_sd_probe.patch