3 files changed, 9 insertions, 8 deletions

diff --git a/drivers/regulator/cpcap-regulator.c b/drivers/regulator/cpcap-regulator.c
index f541b80f1b54..bd910fe123d9 100644
--- a/drivers/regulator/cpcap-regulator.c
+++ b/drivers/regulator/cpcap-regulator.c
@@ -222,7 +222,7 @@ static unsigned int cpcap_map_mode(unsigned int mode)
         case CPCAP_BIT_AUDIO_LOW_PWR:
                 return REGULATOR_MODE_STANDBY;
         default:
-                return -EINVAL;
+                return REGULATOR_MODE_INVALID;
         }
 }
 
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index f47264fa1940..0d3f73eacb99 100644
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -31,6 +31,7 @@ static void of_get_regulation_constraints(struct device_node *np,
         struct regulation_constraints *constraints = &(*init_data)->constraints;
         struct regulator_state *suspend_state;
         struct device_node *suspend_np;
+        unsigned int mode;
         int ret, i;
         u32 pval;
 
@@ -124,11 +125,11 @@ static void of_get_regulation_constraints(struct device_node *np,
 
         if (!of_property_read_u32(np, "regulator-initial-mode", &pval)) {
                 if (desc && desc->of_map_mode) {
-                        ret = desc->of_map_mode(pval);
-                        if (ret == -EINVAL)
+                        mode = desc->of_map_mode(pval);
+                        if (mode == REGULATOR_MODE_INVALID)
                                 pr_err("%s: invalid mode %u\n", np->name, pval);
                         else
-                                constraints->initial_mode = ret;
+                                constraints->initial_mode = mode;
                 } else {
                         pr_warn("%s: mapping for mode %d not defined\n",
                                 np->name, pval);
@@ -163,12 +164,12 @@ static void of_get_regulation_constraints(struct device_node *np,
                 if (!of_property_read_u32(suspend_np, "regulator-mode",
                                           &pval)) {
                         if (desc && desc->of_map_mode) {
-                                ret = desc->of_map_mode(pval);
-                                if (ret == -EINVAL)
+                                mode = desc->of_map_mode(pval);
+                                if (mode == REGULATOR_MODE_INVALID)
                                         pr_err("%s: invalid mode %u\n",
                                                np->name, pval);
                                 else
-                                        suspend_state->mode = ret;
+                                        suspend_state->mode = mode;
                         } else {
                                 pr_warn("%s: mapping for mode %d not defined\n",
                                         np->name, pval);
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index a4456db5849d..884c7505ed91 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -274,7 +274,7 @@ static inline unsigned int twl4030reg_map_mode(unsigned int mode)
         case RES_STATE_SLEEP:
                 return REGULATOR_MODE_STANDBY;
         default:
-                return -EINVAL;
+                return REGULATOR_MODE_INVALID;
         }
 }