Commit 280c96b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()
  regulator: Fix display of null constraints for regulators
parents b49199c8 62737d44

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static int suspend_prepare(struct regulator_dev *rdev, suspend_state_t state) 
static void print_constraints(struct regulator_dev *rdev)

{

	struct regulation_constraints *constraints = rdev->constraints;

	char buf[80];

	char buf[80] = "";

	int count = 0;

	int ret;

drivers/regulator/lp3971.c

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int lp3971_ldo_set_voltage(struct regulator_dev *dev, 
		if (vol_map[val] >= min_vol)

			break;



	if (vol_map[val] > max_vol)

	if (val > LDO_VOL_MAX_IDX || vol_map[val] > max_vol)

		return -EINVAL;



	return lp3971_set_bits(lp3971, LP3971_LDO_VOL_CONTR_REG(ldo),
@@ -272,7 +272,7 @@ static int lp3971_dcdc_set_voltage(struct regulator_dev *dev, 
		if (vol_map[val] >= min_vol)

			break;



	if (vol_map[val] > max_vol)

	if (val > BUCK_TARGET_VOL_MAX_IDX || vol_map[val] > max_vol)

		return -EINVAL;



	ret = lp3971_set_bits(lp3971, LP3971_BUCK_TARGET_VOL1_REG(buck),