Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a193caf authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

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: cb496cd4 ("media: cxd2880-spi: Add optional vcc regulator")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 34106f52

drivers/media/spi/cxd2880-spi.c

+5 −2
Original line number Diff line number Diff line
@@ -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 @@ cxd2880_spi_probe(struct spi_device *spi) 
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;

}