Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce3c0597 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 6a13feb9 7ebcf26c

drivers/regulator/core.c

+4 −4
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static int regulator_check_voltage(struct regulator_dev *rdev, 
		return -ENODEV;

	}

	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;

	}
@@ -240,7 +240,7 @@ static int regulator_check_current_limit(struct regulator_dev *rdev, 
		return -ENODEV;

	}

	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;

	}
@@ -277,7 +277,7 @@ static int regulator_mode_constrain(struct regulator_dev *rdev, int *mode) 
		return -ENODEV;

	}

	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;

	}
@@ -301,7 +301,7 @@ static int regulator_check_drms(struct regulator_dev *rdev) 
		return -ENODEV;

	}

	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 0;