Commit dc7faebc authored by Steve Twiss's avatar Steve Twiss Committed by Greg Kroah-Hartman

regulator: pv88060: Fix notifier mutex lock warning

[ Upstream commit f5821363 ]

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: f307a7e9 ("regulator: pv88060: new regulator driver")
Suggested-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarSteve Twiss <stwiss.opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 88b8cf5c
...@@ -244,9 +244,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data) ...@@ -244,9 +244,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data)
if (reg_val & PV88060_E_VDD_FLT) { if (reg_val & PV88060_E_VDD_FLT) {
for (i = 0; i < PV88060_MAX_REGULATORS; i++) { for (i = 0; i < PV88060_MAX_REGULATORS; i++) {
if (chip->rdev[i] != NULL) { if (chip->rdev[i] != NULL) {
regulator_lock(chip->rdev[i]);
regulator_notifier_call_chain(chip->rdev[i], regulator_notifier_call_chain(chip->rdev[i],
REGULATOR_EVENT_UNDER_VOLTAGE, REGULATOR_EVENT_UNDER_VOLTAGE,
NULL); NULL);
regulator_unlock(chip->rdev[i]);
} }
} }
...@@ -261,9 +263,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data) ...@@ -261,9 +263,11 @@ static irqreturn_t pv88060_irq_handler(int irq, void *data)
if (reg_val & PV88060_E_OVER_TEMP) { if (reg_val & PV88060_E_OVER_TEMP) {
for (i = 0; i < PV88060_MAX_REGULATORS; i++) { for (i = 0; i < PV88060_MAX_REGULATORS; i++) {
if (chip->rdev[i] != NULL) { if (chip->rdev[i] != NULL) {
regulator_lock(chip->rdev[i]);
regulator_notifier_call_chain(chip->rdev[i], regulator_notifier_call_chain(chip->rdev[i],
REGULATOR_EVENT_OVER_TEMP, REGULATOR_EVENT_OVER_TEMP,
NULL); NULL);
regulator_unlock(chip->rdev[i]);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment