]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: pxamci: Fix another error handling path in pxamci_probe()
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Tue, 26 Jul 2022 19:15:51 +0000 (21:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:15:34 +0000 (11:15 +0200)
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@wanadoo.fr>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/07a2dcebf8ede69b484103de8f9df043f158cffd.1658862932.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/pxamci.c

index 00b5465dfb0ce953a7d1f14f60a10c334693e16e..ce0f1a6c27f769789a0cb2e693586ffc61651eb6 100644 (file)
@@ -677,7 +677,7 @@ static int pxamci_probe(struct platform_device *pdev)
 
        ret = pxamci_init_ocr(host);
        if (ret < 0)
-               return ret;
+               goto out;
 
        mmc->caps = 0;
        host->cmdat = 0;