提交 dcb01458 编写于 作者: C Christophe JAILLET 提交者: Mauro Carvalho Chehab

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: cb496cd4 ("media: cxd2880-spi: Add optional vcc regulator")
Signed-off-by: NChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: NSean Young <sean@mess.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab+huawei@kernel.org>
上级 86541f04
...@@ -524,13 +524,13 @@ cxd2880_spi_probe(struct spi_device *spi) ...@@ -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 @@ cxd2880_spi_probe(struct spi_device *spi) ...@@ -618,6 +618,9 @@ cxd2880_spi_probe(struct spi_device *spi)
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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册