OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

media: cxd2880-spi: Fix an error handling path

Browse Source 
[ 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: cb496cd472 ("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>
This commit is contained in:
Christophe JAILLET 2021-06-10 21:54:31 +02:00 committed by Greg Kroah-Hartman
parent 34106f5260
commit 9a193caf9d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/spi/cxd2880-spi.c
View File

@ -524,13 +524,13 @@ cxd2880_spi_probe(struct spi_device *spi)
if (IS_ERR(dvb_spi->vcc_supply)) { if (IS_ERR(dvb_spi->vcc_supply)) {
if (PTR_ERR(dvb_spi->vcc_supply) == -EPROBE_DEFER) { if (PTR_ERR(dvb_spi->vcc_supply) == -EPROBE_DEFER) {
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto fail_adapter; goto fail_regulator;
} }
dvb_spi->vcc_supply = NULL; dvb_spi->vcc_supply = NULL;
} else { } else {
ret = regulator_enable(dvb_spi->vcc_supply); ret = regulator_enable(dvb_spi->vcc_supply);
if (ret) if (ret)
goto fail_adapter; goto fail_regulator;
} }
dvb_spi->spi = spi; dvb_spi->spi = spi;
@ -618,6 +618,9 @@ fail_frontend:
fail_attach: fail_attach:
dvb_unregister_adapter(&dvb_spi->adapter); dvb_unregister_adapter(&dvb_spi->adapter);
fail_adapter: fail_adapter:
if (!dvb_spi->vcc_supply)
regulator_disable(dvb_spi->vcc_supply);
fail_regulator:
kfree(dvb_spi); kfree(dvb_spi);
return ret; return ret;
} }