Merge remote-tracking branches 'regulator/fix/constrain' and 'regulator/fix/defer...

diff --combined drivers/regulator/core.c
index e414c24,881c37e,fd0e4e3..6af3869
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
--- 3/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@@ -906,7 -906,8 -906,7 +906,8 @@@@ static int machine_constraints_voltage(
   
        /* do we need to apply the constraint voltage */
        if (rdev->constraints->apply_uV &&
- -         rdev->constraints->min_uV == rdev->constraints->max_uV) {
+ +         rdev->constraints->min_uV && rdev->constraints->max_uV) {
+ +             int target_min, target_max;
                int current_uV = _regulator_get_voltage(rdev);
                if (current_uV < 0) {
                        rdev_err(rdev,
@@@@ -914,15 -915,32 -914,15 +915,32 @@@@
                                 current_uV);
                        return current_uV;
                }
- -             if (current_uV < rdev->constraints->min_uV ||
- -                 current_uV > rdev->constraints->max_uV) {
+ +
+ +             /*
+ +              * If we're below the minimum voltage move up to the
+ +              * minimum voltage, if we're above the maximum voltage
+ +              * then move down to the maximum.
+ +              */
+ +             target_min = current_uV;
+ +             target_max = current_uV;
+ +
+ +             if (current_uV < rdev->constraints->min_uV) {
+ +                     target_min = rdev->constraints->min_uV;
+ +                     target_max = rdev->constraints->min_uV;
+ +             }
+ +
+ +             if (current_uV > rdev->constraints->max_uV) {
+ +                     target_min = rdev->constraints->max_uV;
+ +                     target_max = rdev->constraints->max_uV;
+ +             }
+ +
+ +             if (target_min != current_uV || target_max != current_uV) {
                        ret = _regulator_do_set_voltage(
- -                             rdev, rdev->constraints->min_uV,
- -                             rdev->constraints->max_uV);
+ +                             rdev, target_min, target_max);
                        if (ret < 0) {
                                rdev_err(rdev,
- -                                     "failed to apply %duV constraint(%d)\n",
- -                                     rdev->constraints->min_uV, ret);
+ +                                     "failed to apply %d-%duV constraint(%d)\n",
+ +                                     target_min, target_max, ret);
                                return ret;
                        }
                }
@@@@ -1150,6 -1168,17 -1150,17 +1168,6 @@@@ static int set_machine_constraints(stru
                }
        }
   
 --     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;
   }
@@@@ -3829,6 -3858,6 -3840,11 +3847,11 @@@@ static void rdev_init_debugfs(struct re
                           &rdev->bypass_count);
   }
   
++ static int regulator_register_resolve_supply(struct device *dev, void *data)
++ {
++      return regulator_resolve_supply(dev_to_rdev(dev));
++ }
++ 
   /**
    * regulator_register - register regulator
    * @regulator_desc: regulator to register
@@@@ -3975,8 -4004,8 -3991,11 +3998,11 @@@@ regulator_register(const struct regulat
        }
   
        rdev_init_debugfs(rdev);
-- out:
        mutex_unlock(&regulator_list_mutex);
++ 
++      /* try to resolve regulators supply since a new one was registered */
++      class_for_each_device(&regulator_class, NULL, NULL,
++                            regulator_register_resolve_supply);
        kfree(config);
        return rdev;
   
@@@@ -3987,15 -4016,15 -4006,16 +4013,16 @@@@ scrub
        regulator_ena_gpio_free(rdev);
        device_unregister(&rdev->dev);
        /* device core frees rdev */
--      rdev = ERR_PTR(ret);
        goto out;
   
   wash:
        regulator_ena_gpio_free(rdev);
   clean:
        kfree(rdev);
--      rdev = ERR_PTR(ret);
--      goto out;
++ out:
++      mutex_unlock(&regulator_list_mutex);
++      kfree(config);
++      return ERR_PTR(ret);
   }
   EXPORT_SYMBOL_GPL(regulator_register);
   
@@@@ -4021,8 -4050,8 -4041,8 +4048,8 @@@@ void regulator_unregister(struct regula
        WARN_ON(rdev->open_count);
        unset_regulator_supplies(rdev);
        list_del(&rdev->list);
 --     mutex_unlock(&regulator_list_mutex);
        regulator_ena_gpio_free(rdev);
 ++     mutex_unlock(&regulator_list_mutex);
        device_unregister(&rdev->dev);
   }
   EXPORT_SYMBOL_GPL(regulator_unregister);