evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'regulator/topic/core' into regulator-next

Browse source
This commit is contained in:
Mark Brown 2015-11-04 11:19:36 +00:00
commit ce3c059731
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/regulator/core.c
View file

@ -180,7 +180,7 @@ static int regulator_check_voltage(struct regulator_dev *rdev,
return -ENODEV; return -ENODEV;
} }
if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) { if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_VOLTAGE)) {
rdev_err(rdev, "operation not allowed\n"); rdev_err(rdev, "voltage operation not allowed\n");
return -EPERM; return -EPERM;
} }
@ -240,7 +240,7 @@ static int regulator_check_current_limit(struct regulator_dev *rdev,
return -ENODEV; return -ENODEV;
} }
if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_CURRENT)) { if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_CURRENT)) {
rdev_err(rdev, "operation not allowed\n"); rdev_err(rdev, "current operation not allowed\n");
return -EPERM; return -EPERM;
} }
@ -277,7 +277,7 @@ static int regulator_mode_constrain(struct regulator_dev *rdev, int *mode)
return -ENODEV; return -ENODEV;
} }
if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_MODE)) { if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_MODE)) {
rdev_err(rdev, "operation not allowed\n"); rdev_err(rdev, "mode operation not allowed\n");
return -EPERM; return -EPERM;
} }
@ -301,7 +301,7 @@ static int regulator_check_drms(struct regulator_dev *rdev)
return -ENODEV; return -ENODEV;
} }
if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS)) { if (!(rdev->constraints->valid_ops_mask & REGULATOR_CHANGE_DRMS)) {
rdev_dbg(rdev, "operation not allowed\n"); rdev_dbg(rdev, "drms operation not allowed\n");
return -EPERM; return -EPERM;
} }
return 0; return 0;