Merge remote-tracking branches 'regulator/fix/ad5398', 'regulator/fix/da9210', 'regul...

diff --combined drivers/regulator/da9210-regulator.c
index 8b3cc9f,8b3cc9f,cfd6e8a,8b3cc9f,8b3cc9f..01c0e37
--- 1/drivers/regulator/da9210-regulator.c
--- 2/drivers/regulator/da9210-regulator.c
--- 3/drivers/regulator/da9210-regulator.c
--- 4/drivers/regulator/da9210-regulator.c
--- 5/drivers/regulator/da9210-regulator.c
+++ b/drivers/regulator/da9210-regulator.c
@@@@@@ -46,7 -46,7 -46,7 -46,7 -46,7 +46,7 @@@@@@ static int da9210_set_current_limit(str
                                    int max_uA);
     static int da9210_get_current_limit(struct regulator_dev *rdev);
     
  -  static struct regulator_ops da9210_buck_ops = {
  +  static const struct regulator_ops da9210_buck_ops = {
        .enable = regulator_enable_regmap,
        .disable = regulator_disable_regmap,
        .is_enabled = regulator_is_enabled_regmap,
@@@@@@ -132,6 -132,6 -132,8 -132,6 -132,6 +132,8 @@@@@@ static irqreturn_t da9210_irq_handler(i
        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 -155,6 -157,9 -155,6 -155,6 +157,9 @@@@@@
                                              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);