regulator: da9210: fix lockdep warning
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Tue, 12 Jan 2016 17:28:51 +0000 (18:28 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 15 Jan 2016 18:09:35 +0000 (18:09 +0000)
Commit 70cfef26267474 ("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: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/regulator/da9210-regulator.c

index b3517830edb6f0ea2139cbc5ebe902ce8cf8265d..cfd6e8af67ecd77805abc9102e381d874398d812 100644 (file)
@@ -132,6 +132,8 @@ static irqreturn_t da9210_irq_handler(int irq, void *data)
        if (error < 0)
                goto error_i2c;
 
+       mutex_lock(&chip->rdev->mutex);
+
        if (val & DA9210_E_OVCURR) {
                regulator_notifier_call_chain(chip->rdev,
                                              REGULATOR_EVENT_OVER_CURRENT,
@@ -155,6 +157,9 @@ static irqreturn_t da9210_irq_handler(int irq, void *data)
                                              NULL);
                handled |= DA9210_E_VMAX;
        }
+
+       mutex_unlock(&chip->rdev->mutex);
+
        if (handled) {
                /* Clear handled events */
                error = regmap_write(chip->regmap, DA9210_REG_EVENT_B, handled);