git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 7f70be6e4025db0551e6863e7eb9cca07122695c Mon Sep 17 00:00:00 2001
   2 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
   3 Date: Sat, 23 Sep 2017 08:06:19 +0200
   4 Subject: iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of 'twl4030_madc_probe()'
   5
   6 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
   7
   8 commit 7f70be6e4025db0551e6863e7eb9cca07122695c upstream.
   9
  10 Commit 7cc97d77ee8a has introduced a call to 'regulator_disable()' in the
  11 .remove function.
  12 So we should also have such a call in the .probe function in case of
  13 error after a successful 'regulator_enable()' call.
  14
  15 Add a new label for that and use it.
  16
  17 Fixes: 7cc97d77ee8a ("iio: adc: twl4030: Fix ADC[3:6] readings")
  18 Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
  19 Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  20 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  21
  22 ---
  23  drivers/iio/adc/twl4030-madc.c |    4 +++-
  24  1 file changed, 3 insertions(+), 1 deletion(-)
  25
  26 --- a/drivers/iio/adc/twl4030-madc.c
  27 +++ b/drivers/iio/adc/twl4030-madc.c
  28 @@ -899,11 +899,13 @@ static int twl4030_madc_probe(struct pla
  29         ret = iio_device_register(iio_dev);
  30         if (ret) {
  31                 dev_err(&pdev->dev, "could not register iio device\n");
  32 -               goto err_i2c;
  33 +               goto err_usb3v1;
  34         }
  35
  36         return 0;
  37
  38 +err_usb3v1:
  39 +       regulator_disable(madc->usb3v1);
  40  err_i2c:
  41         twl4030_madc_set_current_generator(madc, 0, 0);
  42  err_current_generator: