OSDN Git Service

iio: ad7292: Prevent regulator double disable
authorMatti Vaittinen <mazziesaccount@gmail.com>
Fri, 19 Aug 2022 08:51:07 +0000 (11:51 +0300)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 21 Aug 2022 17:24:16 +0000 (18:24 +0100)
The ad7292 tries to add an devm_action for disabling a regulator at
device detach using devm_add_action_or_reset(). The
devm_add_action_or_reset() does call the release function should adding
action fail. The driver inspects the value returned by
devm_add_action_or_reset() and manually calls regulator_disable() if
adding the action has failed. This leads to double disable and messes
the enable count for regulator.

Do not manually call disable if devm_add_action_or_reset() fails.

Fixes: 506d2e317a0a ("iio: adc: Add driver support for AD7292")
Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
Tested-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com>
Link: https://lore.kernel.org/r/Yv9O+9sxU7gAv3vM@fedora
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad7292.c

index 92c68d4..a2f9fda 100644 (file)
@@ -287,10 +287,8 @@ static int ad7292_probe(struct spi_device *spi)
 
                ret = devm_add_action_or_reset(&spi->dev,
                                               ad7292_regulator_disable, st);
-               if (ret) {
-                       regulator_disable(st->reg);
+               if (ret)
                        return ret;
-               }
 
                ret = regulator_get_voltage(st->reg);
                if (ret < 0)