lkml.org 
[lkml]   [2017]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.13 082/160] iio: adc: twl4030: Disable the vusb3v1 rugulator in the error handling path of twl4030_madc_probe()
    Date
    4.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    commit 7f70be6e4025db0551e6863e7eb9cca07122695c upstream.

    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>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/iio/adc/twl4030-madc.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    --- a/drivers/iio/adc/twl4030-madc.c
    +++ b/drivers/iio/adc/twl4030-madc.c
    @@ -899,11 +899,13 @@ static int twl4030_madc_probe(struct pla
    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:

    \
     
     \ /
      Last update: 2017-10-10 22:18    [W:4.714 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site