A successful 'regulator_enable()' call should be balanced by a
corresponding 'regulator_disable()' call in the error handling path of the
probe, as already done in the remove function.
Update the error handling path accordingly.
Fixes: 913b86468674 ("iio: adc: Add TI ADC128S052")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/iio/adc/ti-adc128s052.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
index 3143f35a6509..83c1ae07b3e9 100644
--- a/drivers/iio/adc/ti-adc128s052.c
+++ b/drivers/iio/adc/ti-adc128s052.c
@@ -171,7 +171,13 @@ static int adc128_probe(struct spi_device *spi)
mutex_init(&adc->lock);
ret = iio_device_register(indio_dev);
+ if (ret)
+ goto err_disable_regulator;
+ return 0;
+
+err_disable_regulator:
+ regulator_disable(adc->reg);
return ret;
}
--
2.30.2
On Sat, Aug 21, 2021 at 1:43 PM Christophe JAILLET
<[email protected]> wrote:
>
> A successful 'regulator_enable()' call should be balanced by a
> corresponding 'regulator_disable()' call in the error handling path of the
> probe, as already done in the remove function.
>
> Update the error handling path accordingly.
Good catch.
For the fix:
Reviewed-by: Alexandru Ardelean <[email protected]>
If you want, you can also send a conversion to
devm_iio_device_register() for this driver.
And also move the regulator_disable() on a devm_add_action_or_reset() callback.
Maybe, that's already part of your plan. If so, apologies for the noise :)
>
> Fixes: 913b86468674 ("iio: adc: Add TI ADC128S052")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/iio/adc/ti-adc128s052.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c
> index 3143f35a6509..83c1ae07b3e9 100644
> --- a/drivers/iio/adc/ti-adc128s052.c
> +++ b/drivers/iio/adc/ti-adc128s052.c
> @@ -171,7 +171,13 @@ static int adc128_probe(struct spi_device *spi)
> mutex_init(&adc->lock);
>
> ret = iio_device_register(indio_dev);
> + if (ret)
> + goto err_disable_regulator;
>
> + return 0;
> +
> +err_disable_regulator:
> + regulator_disable(adc->reg);
> return ret;
> }
>
> --
> 2.30.2
>
Le 23/08/2021 à 08:42, Alexandru Ardelean a écrit :
> On Sat, Aug 21, 2021 at 1:43 PM Christophe JAILLET
> <[email protected]> wrote:
>>
>> A successful 'regulator_enable()' call should be balanced by a
>> corresponding 'regulator_disable()' call in the error handling path of the
>> probe, as already done in the remove function.
>>
>> Update the error handling path accordingly.
>
> Good catch.
> For the fix:
>
> Reviewed-by: Alexandru Ardelean <[email protected]>
>
> If you want, you can also send a conversion to
> devm_iio_device_register() for this driver.
> And also move the regulator_disable() on a devm_add_action_or_reset() callback.
> Maybe, that's already part of your plan. If so, apologies for the noise :)
>
Hi,
I hadn't planned another step but I can send a follow-up patch for that.
CJ
On Tue, 24 Aug 2021 21:45:38 +0200
Christophe JAILLET <[email protected]> wrote:
> Le 23/08/2021 à 08:42, Alexandru Ardelean a écrit :
> > On Sat, Aug 21, 2021 at 1:43 PM Christophe JAILLET
> > <[email protected]> wrote:
> >>
> >> A successful 'regulator_enable()' call should be balanced by a
> >> corresponding 'regulator_disable()' call in the error handling path of the
> >> probe, as already done in the remove function.
> >>
> >> Update the error handling path accordingly.
> >
> > Good catch.
> > For the fix:
> >
> > Reviewed-by: Alexandru Ardelean <[email protected]>
Applied and marked for stable.
Thanks,
> >
> > If you want, you can also send a conversion to
> > devm_iio_device_register() for this driver.
> > And also move the regulator_disable() on a devm_add_action_or_reset() callback.
> > Maybe, that's already part of your plan. If so, apologies for the noise :)
> >
>
> Hi,
>
> I hadn't planned another step but I can send a follow-up patch for that.
>
> CJ
Note I'll have to sit on that one until this patch is upstream which will be a few weeks
(perhaps a month) given timing.
Jonathan