diff options
| author |   Mark Brown <broonie@kernel.org> | 2016-05-13 14:22:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 14:22:41 +0100 |
| commit | 5535fc7958efbd68542def0abd6c9e6b3a9e6812 (patch) | |
| tree | dfd39e8ba64cf34f1b74c618fe7919965f18dfd3 | |
| parent | Merge remote-tracking branch 'regulator/fix/bypass' into regulator-linus (diff) | |
| parent | regulator: core: Fix locking of GPIO list on free (diff) | |
| download | wireguard-linux-5535fc7958efbd68542def0abd6c9e6b3a9e6812.tar.xz wireguard-linux-5535fc7958efbd68542def0abd6c9e6b3a9e6812.zip | |
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
| -rw-r--r-- | drivers/regulator/core.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index e0b764284773..e414c24b2906 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1150,17 +1150,6 @@ static int set_machine_constraints(struct regulator_dev *rdev, } } - 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; } @@ -4032,8 +4021,8 @@ void regulator_unregister(struct regulator_dev *rdev) WARN_ON(rdev->open_count); unset_regulator_supplies(rdev); list_del(&rdev->list); - mutex_unlock(®ulator_list_mutex); regulator_ena_gpio_free(rdev); + mutex_unlock(®ulator_list_mutex); device_unregister(&rdev->dev); } EXPORT_SYMBOL_GPL(regulator_unregister); |