summaryrefslogtreecommitdiff
path: root/drivers/regulator/of_regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-09-28 16:50:33 +0300
committerMark Brown <broonie@kernel.org>2018-09-28 16:50:33 +0300
commit2e0fe4d0c6ca59c3c05f9e6b0067d70cb9821500 (patch)
treefb91e153cb7810f146732b052f0efb8137aaf13f /drivers/regulator/of_regulator.c
parent61b2e6741e81226c29a5ed92fd886f11efb78e98 (diff)
parentfb6de923ca3358a91525552b4907d4cb38730bdd (diff)
downloadlinux-2e0fe4d0c6ca59c3c05f9e6b0067d70cb9821500.tar.xz
Merge tag 'regulator-v4.19-rc5' into regulator-bd718xx
regulator: Fixes for 4.19 A collection of fairly minor bug fixes here, a couple of driver specific ones plus two core fixes. There's one fix for the new suspend state code which fixes some confusion with constant values that are supposed to indicate noop operation and another fixing a race condition with the creation of sysfs files on new regulators.
Diffstat (limited to 'drivers/regulator/of_regulator.c')
-rw-r--r--drivers/regulator/of_regulator.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 92a516b959a7..c4223b3e0dff 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -213,8 +213,6 @@ static void of_get_regulation_constraints(struct device_node *np,
else if (of_property_read_bool(suspend_np,
"regulator-off-in-suspend"))
suspend_state->enabled = DISABLE_IN_SUSPEND;
- else
- suspend_state->enabled = DO_NOTHING_IN_SUSPEND;
if (!of_property_read_u32(np, "regulator-suspend-min-microvolt",
&pval))