summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 16:22:41 +0300
committerMark Brown <broonie@kernel.org>2016-05-13 16:22:41 +0300
commit5535fc7958efbd68542def0abd6c9e6b3a9e6812 (patch)
treedfd39e8ba64cf34f1b74c618fe7919965f18dfd3 /drivers/regulator
parente9cb77d03ca1055d0d65483bc972a5a0e8d3eeed (diff)
parent2c0a303a128cbef54a7b58dc2e413b874d760097 (diff)
downloadlinux-5535fc7958efbd68542def0abd6c9e6b3a9e6812.tar.xz
Merge remote-tracking branch 'regulator/fix/core' into regulator-linus
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c13
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(&regulator_list_mutex);
regulator_ena_gpio_free(rdev);
+ mutex_unlock(&regulator_list_mutex);
device_unregister(&rdev->dev);
}
EXPORT_SYMBOL_GPL(regulator_unregister);