Commit ce3c0597 authored by Mark Brown's avatar Mark Brown

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

parents 6a13feb9 7ebcf26c
...@@ -180,7 +180,7 @@ static int regulator_check_voltage(struct regulator_dev *rdev, ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment