]> git.hungrycats.org Git - linux/commitdiff
regulator: da9055: Fix notifier mutex lock warning
authorSteve Twiss <stwiss.opensource@diasemi.com>
Tue, 26 Feb 2019 14:59:59 +0000 (14:59 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 May 2019 13:45:22 +0000 (06:45 -0700)
[ Upstream commit 5e6afb3832bedf420dd8e4c5b32ed85117c5087d ]

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: f6130be652d0 ("regulator: DA9055 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>
drivers/regulator/da9055-regulator.c

index 588c3d2445cf364c91cdcbb2c6376aaa095750ee..acba42d5b57d4c65d450efe51dbe15ff234796b7 100644 (file)
@@ -515,8 +515,10 @@ static irqreturn_t da9055_ldo5_6_oc_irq(int irq, void *data)
 {
        struct da9055_regulator *regulator = data;
 
+       regulator_lock(regulator->rdev);
        regulator_notifier_call_chain(regulator->rdev,
                                      REGULATOR_EVENT_OVER_CURRENT, NULL);
+       regulator_unlock(regulator->rdev);
 
        return IRQ_HANDLED;
 }