Merge remote-tracking branches 'regulator/topic/ltc3589', 'regulator/topic/max77620...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/core.c
index 1cff112,744c988,5b1e049,744c988,744c988,744c988..e0b7642
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
--- 4/drivers/regulator/core.c
--- 5/drivers/regulator/core.c
--- 6/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@@@@ -1135,23 -1136,16 -1136,38 -1136,16 -1136,16 -1136,16 +1135,34 @@@@@@@ static int set_machine_constraints(stru
                ret = ops->set_over_current_protection(rdev);
                if (ret < 0) {
                        rdev_err(rdev, "failed to set over current protection\n");
 -----                  goto out;
 +++++                  return ret;
 + +++          }
 + +++  }
 + +++
 + +++  if (rdev->constraints->active_discharge && ops->set_active_discharge) {
 + +++          bool ad_state = (rdev->constraints->active_discharge ==
 + +++                        REGULATOR_ACTIVE_DISCHARGE_ENABLE) ? true : false;
 + +++
 + +++          ret = ops->set_active_discharge(rdev, ad_state);
 + +++          if (ret < 0) {
 + +++                  rdev_err(rdev, "failed to set active discharge\n");
 + +++                  return ret;
 + +++          }
 + +++  }
 + +++
++ +++  if (rdev->constraints->active_discharge && ops->set_active_discharge) {
++ +++          bool ad_state = (rdev->constraints->active_discharge ==
++ +++                        REGULATOR_ACTIVE_DISCHARGE_ENABLE) ? true : false;
++ +++
++ +++          ret = ops->set_active_discharge(rdev, ad_state);
++ +++          if (ret < 0) {
++ +++                  rdev_err(rdev, "failed to set active discharge\n");
++ +++                  return ret;
+               }
+       }
+     
        print_constraints(rdev);
        return 0;
 -----out:
 -----  kfree(rdev->constraints);
 -----  rdev->constraints = NULL;
 -----  return ret;
      }
      
      /**