2 files changed, 27 insertions, 4 deletions

diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 7d0c0d7d90ca..2dab0d9e11f5 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -581,10 +581,29 @@ static int suspend_set_state(struct regulator_dev *rdev,
         struct regulator_state *rstate)
 {
         int ret = 0;
+        bool can_set_state;
 
-        /* enable & disable are mandatory for suspend control */
-        if (!rdev->desc->ops->set_suspend_enable ||
-                !rdev->desc->ops->set_suspend_disable) {
+        can_set_state = rdev->desc->ops->set_suspend_enable &&
+                rdev->desc->ops->set_suspend_disable;
+
+        /* If we have no suspend mode configration don't set anything;
+         * only warn if the driver actually makes the suspend mode
+         * configurable.
+         */
+        if (!rstate->enabled && !rstate->disabled) {
+                if (can_set_state)
+                        printk(KERN_WARNING "%s: No configuration for %s\n",
+                               __func__, rdev_get_name(rdev));
+                return 0;
+        }
+
+        if (rstate->enabled && rstate->disabled) {
+                printk(KERN_ERR "%s: invalid configuration for %s\n",
+                       __func__, rdev_get_name(rdev));
+                return -EINVAL;
+        }
+
+        if (!can_set_state) {
                 printk(KERN_ERR "%s: no way to set suspend state\n",
                         __func__);
                 return -EINVAL;
diff --git a/include/linux/regulator/machine.h b/include/linux/regulator/machine.h
index 87f5f176d4ef..234a8476cba8 100644
--- a/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@ -43,16 +43,20 @@ struct regulator;
 /**
  * struct regulator_state - regulator state during low power system states
  *
- * This describes a regulators state during a system wide low power state.
+ * This describes a regulators state during a system wide low power
+ * state.  One of enabled or disabled must be set for the
+ * configuration to be applied.
  *
  * @uV: Operating voltage during suspend.
  * @mode: Operating mode during suspend.
  * @enabled: Enabled during suspend.
+ * @disabled: Disabled during suspend.
  */
 struct regulator_state {
         int uV; /* suspend voltage */
         unsigned int mode; /* suspend regulator operating mode */
         int enabled; /* is regulator enabled in this suspend state */
+        int disabled; /* is the regulator disbled in this suspend state */
 };
 
 /**