aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-11-04 06:19:36 -0500
committerMark Brown <broonie@kernel.org>2015-11-04 06:19:36 -0500
commitce3c059731043f7945dcd80b816540dbd7f928bd (patch)
tree791723164eee51139bf0cd7c7142caa0c203d644
parent6a13feb9c82803e2b815eca72fa7a9f5561d7861 (diff)
parent7ebcf26c39205ca8d61c178dcd3f5be4f25b1309 (diff)
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
-rw-r--r--drivers/regulator/core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 8a34f6acc801..455732c2e843 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -180,7 +180,7 @@ static int regulator_check_voltage(struct regulator_dev *rdev,
180 return -ENODEV; 180 return -ENODEV;
181 } 181 }
182 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) { 182 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {
183 rdev_err(rdev, "operation not allowed\n"); 183 rdev_err(rdev, "voltage operation not allowed\n");
184 return -EPERM; 184 return -EPERM;
185 } 185 }
186 186
@@ -240,7 +240,7 @@ static int regulator_check_current_limit(struct regulator_dev *rdev,
240 return -ENODEV; 240 return -ENODEV;
241 } 241 }
242 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_CURRENT)) { 242 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_CURRENT)) {
243 rdev_err(rdev, "operation not allowed\n"); 243 rdev_err(rdev, "current operation not allowed\n");
244 return -EPERM; 244 return -EPERM;
245 } 245 }
246 246
@@ -277,7 +277,7 @@ static int regulator_mode_constrain(struct regulator_dev *rdev, int *mode)
277 return -ENODEV; 277 return -ENODEV;
278 } 278 }
279 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_MODE)) { 279 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_MODE)) {
280 rdev_err(rdev, "operation not allowed\n"); 280 rdev_err(rdev, "mode operation not allowed\n");
281 return -EPERM; 281 return -EPERM;
282 } 282 }
283 283
@@ -301,7 +301,7 @@ static int regulator_check_drms(struct regulator_dev *rdev)
301 return -ENODEV; 301 return -ENODEV;
302 } 302 }
303 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS)) { 303 if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS)) {
304 rdev_dbg(rdev, "operation not allowed\n"); 304 rdev_dbg(rdev, "drms operation not allowed\n");
305 return -EPERM; 305 return -EPERM;
306 } 306 }
307 return 0; 307 return 0;