media: cxd2880-spi: Fix an error handling path
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>
This commit is contained in:
Родитель
86541f0480
Коммит
dcb0145821
|
@ -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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче