Commit 0f48eeda authored by Wolfram Sang's avatar Wolfram Sang Committed by Mark Brown

regulator: da9210: fix lockdep warning

Commit 70cfef26 ("regulator: Add lockdep asserts to help detecting
locking misuse") successfully created this WARN, let's fix it:

[    1.218660] WARNING: CPU: 0 PID: 553 at drivers/regulator/core.c:3646 regulator_notifier_call_chain+0x5c/0x88()
...
[    1.220278] [<c0246c20>] (regulator_notifier_call_chain) from [<c02498b4>] (da9210_irq_handler+0x74/0x10c)
[    1.220412]  r7:c0080cac r6:eb1daa00 r5:e64bbf10 r4:00000002
[    1.220547] [<c0249840>] (da9210_irq_handler) from [<c0080cd8>] (irq_thread_fn+0x2c/0x44)
...
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8005c49d
...@@ -132,6 +132,8 @@ static irqreturn_t da9210_irq_handler(int irq, void *data) ...@@ -132,6 +132,8 @@ static irqreturn_t da9210_irq_handler(int irq, void *data)
if (error < 0) if (error < 0)
goto error_i2c; goto error_i2c;
mutex_lock(&chip->rdev->mutex);
if (val & DA9210_E_OVCURR) { if (val & DA9210_E_OVCURR) {
regulator_notifier_call_chain(chip->rdev, regulator_notifier_call_chain(chip->rdev,
REGULATOR_EVENT_OVER_CURRENT, REGULATOR_EVENT_OVER_CURRENT,
...@@ -155,6 +157,9 @@ static irqreturn_t da9210_irq_handler(int irq, void *data) ...@@ -155,6 +157,9 @@ static irqreturn_t da9210_irq_handler(int irq, void *data)
NULL); NULL);
handled |= DA9210_E_VMAX; handled |= DA9210_E_VMAX;
} }
mutex_unlock(&chip->rdev->mutex);
if (handled) { if (handled) {
/* Clear handled events */ /* Clear handled events */
error = regmap_write(chip->regmap, DA9210_REG_EVENT_B, handled); error = regmap_write(chip->regmap, DA9210_REG_EVENT_B, handled);
......
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