media: cxd2880-spi: Fix an error handling path

[ Upstream commit dcb0145821017e929a733e2271c85c6f82b9c9f8 ]

If an error occurs after a successful 'regulator_enable()' call,
'regulator_disable()' must be called.

Fix the error handling path of the probe accordingly.

Fixes: cb496cd472af ("media: cxd2880-spi: Add optional vcc regulator")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c
index 931ec0727cd387841db0419536593c3ee4bbbc0e..a280e4bd80c2f7889ca50bd75f5698315de4076f 100644 (file)
--- a/drivers/media/spi/cxd2880-spi.c
+++ b/drivers/media/spi/cxd2880-spi.c
@@ -524,13 +524,13 @@ cxd2880_spi_probe(struct spi_device *spi)
        if (IS_ERR(dvb_spi->vcc_supply)) {
                if (PTR_ERR(dvb_spi->vcc_supply) == -EPROBE_DEFER) {
                        ret = -EPROBE_DEFER;
-                       goto fail_adapter;
+                       goto fail_regulator;
                }
                dvb_spi->vcc_supply = NULL;
        } else {
                ret = regulator_enable(dvb_spi->vcc_supply);
                if (ret)
-                       goto fail_adapter;
+                       goto fail_regulator;
        }
 
        dvb_spi->spi = spi;
@@ -618,6 +618,9 @@ fail_frontend:
 fail_attach:
        dvb_unregister_adapter(&dvb_spi->adapter);
 fail_adapter:
+       if (!dvb_spi->vcc_supply)
+               regulator_disable(dvb_spi->vcc_supply);
+fail_regulator:
        kfree(dvb_spi);
        return ret;
 }