Merge tag 'nfs-for-4.8-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / drivers / regulator / of_regulator.c

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index cd828dbf9d529e6d459c9e9eae65c6d252b7a1e4..4f613ec995004dc04aa62bef738091bdaf38093d 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -163,6 +163,9 @@ static void of_get_regulation_constraints(struct device_node *np,
                                        "regulator-suspend-microvolt", &pval))
                        suspend_state->uV = pval;
 
+               if (i == PM_SUSPEND_MEM)
+                       constraints->initial_state = PM_SUSPEND_MEM;
+
                of_node_put(suspend_np);
                suspend_state = NULL;
                suspend_np = NULL;