summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Twiss <stwiss.opensource@diasemi.com>2019-02-26 15:23:02 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-31 06:45:22 -0700
commite092e6a8de2c9dafac78c2b8e4cf6398546e73a9 (patch)
tree93185ec0fcdb44df327dfd67a84ba6b702d47cfa
parent4b29e0fd93999140bf8d43f9d4a0d95276fb3a6e (diff)
downloadlinux-e092e6a8de2c9dafac78c2b8e4cf6398546e73a9.tar.gz
linux-e092e6a8de2c9dafac78c2b8e4cf6398546e73a9.tar.bz2
linux-e092e6a8de2c9dafac78c2b8e4cf6398546e73a9.zip
regulator: da9063: Fix notifier mutex lock warning
[ Upstream commit 29d40b4a5776ec4727c9f0e00a884423dd5e3366 ] 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: 69ca3e58d178 ("regulator: da9063: Add Dialog DA9063 voltage regulators support.") 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>
-rw-r--r--drivers/regulator/da9063-regulator.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/regulator/da9063-regulator.c b/drivers/regulator/da9063-regulator.c
index 8cbcd2a3eb20..d3ea73ab5920 100644
--- a/drivers/regulator/da9063-regulator.c
+++ b/drivers/regulator/da9063-regulator.c
@@ -615,9 +615,12 @@ static irqreturn_t da9063_ldo_lim_event(int irq, void *data)
if (regl->info->oc_event.reg != DA9063_REG_STATUS_D)
continue;
- if (BIT(regl->info->oc_event.lsb) & bits)
+ if (BIT(regl->info->oc_event.lsb) & bits) {
+ regulator_lock(regl->rdev);
regulator_notifier_call_chain(regl->rdev,
REGULATOR_EVENT_OVER_CURRENT, NULL);
+ regulator_unlock(regl->rdev);
+ }
}
return IRQ_HANDLED;