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

Commit 7f70be6e authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jonathan Cameron
Browse files

iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of... 


iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of 'twl4030_madc_probe()'

Commit 7cc97d77 has introduced a call to 'regulator_disable()' in the
.remove function.
So we should also have such a call in the .probe function in case of
error after a successful 'regulator_enable()' call.

Add a new label for that and use it.

Fixes: 7cc97d77 ("iio: adc: twl4030: Fix ADC[3:6] readings")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: <Stable@vger.kernel.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 245a396a

drivers/iio/adc/twl4030-madc.c

+3 −1
Original line number Diff line number Diff line
@@ -899,11 +899,13 @@ static int twl4030_madc_probe(struct platform_device *pdev) 
	ret = iio_device_register(iio_dev);

	if (ret) {

		dev_err(&pdev->dev, "could not register iio device\n");

		goto err_i2c;

		goto err_usb3v1;

	}



	return 0;



err_usb3v1:

	regulator_disable(madc->usb3v1);

err_i2c:

	twl4030_madc_set_current_generator(madc, 0, 0);

err_current_generator: