]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
regulator: pv88060: Fix notifier mutex lock warning
authorSteve Twiss <stwiss.opensource@diasemi.com>
Tue, 26 Feb 2019 15:42:50 +0000 (15:42 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:11:36 +0000 (14:11 +0200)
BugLink: https://bugs.launchpad.net/bugs/1837517
[ Upstream commit f58213637206e190453e3bd91f98f535566290a3 ]

The mutex for the regulator_dev must be controlled by the caller of
the regulator_notifier_call_chain(), as described in the comment
for that function.

Failure to mutex lock and unlock surrounding the notifier call results
in a kernel WARN_ON_ONCE() which will dump a backtrace for the
regulator_notifier_call_chain() when that function call is first made.
The mutex can be controlled using the regulator_lock/unlock() API.

Fixes: f307a7e9b7af ("regulator: pv88060: new regulator driver")
Suggested-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Steve Twiss <stwiss.opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/regulator/pv88060-regulator.c

index a9446056435f9b71772d4cecb33017c42abeebcf..000c34914fe395ccee5f4c642784a6a7e2a6df25 100644 (file)
@@ -276,9 +276,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data)
        if (reg_val & PV88060_E_VDD_FLT) {
                for (i = 0; i < PV88060_MAX_REGULATORS; i++) {
                        if (chip->rdev[i] != NULL) {
+                               regulator_lock(chip->rdev[i]);
                                regulator_notifier_call_chain(chip->rdev[i],
                                        REGULATOR_EVENT_UNDER_VOLTAGE,
                                        NULL);
+                               regulator_unlock(chip->rdev[i]);
                        }
                }
 
@@ -293,9 +295,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data)
        if (reg_val & PV88060_E_OVER_TEMP) {
                for (i = 0; i < PV88060_MAX_REGULATORS; i++) {
                        if (chip->rdev[i] != NULL) {
+                               regulator_lock(chip->rdev[i]);
                                regulator_notifier_call_chain(chip->rdev[i],
                                        REGULATOR_EVENT_OVER_TEMP,
                                        NULL);
+                               regulator_unlock(chip->rdev[i]);
                        }
                }