[PATCH 2/3] iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of 'twl4030_madc_probe()'

From	Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Newsgroups	linux.kernel
Subject	[PATCH 2/3] iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of 'twl4030_madc_probe()'
Date	2017-09-23 08:10 +0200
Message-ID	<usLNv-7Vv-13@gated-at.bofh.it> (permalink)
References	<usLNv-7Vv-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit 7cc97d77ee8a 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: 7cc97d77ee8a ("iio: adc: twl4030: Fix ADC[3:6] readings")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/iio/adc/twl4030-madc.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index 80ab2ed70b85..32db23d9a483 100644
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -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:
-- 
2.11.0

Thread

[PATCH 1/3] iio: adc: twl4030: Fix an error handling path in 'twl4030_madc_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-23 08:10 +0200
  [PATCH 2/3] iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of 'twl4030_madc_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-23 08:10 +0200
    Re: [PATCH 2/3] iio: adc: twl4030: Disable the vusb3v1 rugulator in  the error handling path of 'twl4030_madc_probe()' Jonathan Cameron <jic23@kernel.org> - 2017-09-24 14:10 +0200
  [PATCH 3/3] iio: adc: twl4030: Return an error if we can not enable the vusb3v1 regulator in 'twl4030_madc_probe()' Christophe JAILLET <christophe.jaillet@wanadoo.fr> - 2017-09-23 08:10 +0200
    Re: [PATCH 3/3] iio: adc: twl4030: Return an error if we can not  enable the vusb3v1 regulator in 'twl4030_madc_probe()' Jonathan Cameron <jic23@kernel.org> - 2017-09-24 14:10 +0200
  Re: [PATCH 1/3] iio: adc: twl4030: Fix an error handling path in  'twl4030_madc_probe()' Jonathan Cameron <jic23@kernel.org> - 2017-09-24 14:00 +0200

csiph-web