tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 280c96b1 b49199c8

+3 -3
+1 -1
drivers/regulator/core.c
··· 661 661 static void print_constraints(struct regulator_dev *rdev) 662 662 { 663 663 struct regulation_constraints *constraints = rdev->constraints; 664 - char buf[80]; 664 + char buf[80] = ""; 665 665 int count = 0; 666 666 int ret; 667 667
+2 -2
drivers/regulator/lp3971.c
··· 183 183 if (vol_map[val] >= min_vol) 184 184 break; 185 185 186 - if (vol_map[val] > max_vol) 186 + if (val > LDO_VOL_MAX_IDX || vol_map[val] > max_vol) 187 187 return -EINVAL; 188 188 189 189 return lp3971_set_bits(lp3971, LP3971_LDO_VOL_CONTR_REG(ldo), ··· 272 272 if (vol_map[val] >= min_vol) 273 273 break; 274 274 275 - if (vol_map[val] > max_vol) 275 + if (val > BUCK_TARGET_VOL_MAX_IDX || vol_map[val] > max_vol) 276 276 return -EINVAL; 277 277 278 278 ret = lp3971_set_bits(lp3971, LP3971_BUCK_TARGET_VOL1_REG(buck),