This is a note to let you know that I've just added the patch titled
mmc: pxamci: Fix another error handling path in pxamci_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-pxamci-fix-another-error-handling-path-in-pxamci_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 b886f54c300d31c109d2e4336b22922b64e7ba7d Mon Sep 17 00:00:00 2001
From: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Date: Tue, 26 Jul 2022 21:15:51 +0200
Subject: mmc: pxamci: Fix another error handling path in pxamci_probe()
From: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
commit b886f54c300d31c109d2e4336b22922b64e7ba7d upstream.
The commit in Fixes: has introduced an new error handling without branching
to the existing error handling path.
Update it now and release some resources if pxamci_init_ocr() fails.
Fixes: 61951fd6cb49 ("mmc: pxamci: let mmc core handle regulators")
Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Link: https://lore.kernel.org/r/07a2dcebf8ede69b484103de8f9df043f158cffd.1658862932.git.christophe.jaillet@xxxxxxxxxx
Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/host/pxamci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -672,7 +672,7 @@ static int pxamci_probe(struct platform_
ret = pxamci_init_ocr(host);
if (ret < 0)
- return ret;
+ goto out;
mmc->caps = 0;
host->cmdat = 0;
Patches currently in stable-queue which might be from christophe.jaillet@xxxxxxxxxx are
queue-5.4/memstick-ms_block-fix-a-memory-leak.patch
queue-5.4/misc-rtsx-fix-an-error-handling-path-in-rtsx_pci_pro.patch
queue-5.4/memstick-ms_block-fix-some-incorrect-memory-allocati.patch
queue-5.4/asoc-qcom-q6dsp-fix-an-off-by-one-in-q6adm_alloc_cop.patch
queue-5.4/wifi-p54-fix-an-error-handling-path-in-p54spi_probe.patch
queue-5.4/mmc-pxamci-fix-an-error-handling-path-in-pxamci_probe.patch
queue-5.4/mtd-rawnand-meson-fix-a-potential-double-free-issue.patch
queue-5.4/intel_th-fix-a-resource-leak-in-an-error-handling-pa.patch
queue-5.4/mmc-pxamci-fix-another-error-handling-path-in-pxamci_probe.patch
queue-5.4/drm-rockchip-fix-an-error-handling-path-rockchip_dp_.patch
