Merge tag 'v3.4-rc2' into regulator-drivers

Linux 3.4-rc2 contains some fixes that further patches depend upon.
This commit is contained in:
Mark Brown
2012-04-10 09:52:59 +01:00
bovenliggende a9d5801041 0034102808
commit b920eb41a8
611 gewijzigde bestanden met toevoegingen van 8722 en 3699 verwijderingen

Bestand weergeven

@@ -101,7 +101,7 @@ static int wm831x_isink_set_current(struct regulator_dev *rdev,
for (i = 0; i < ARRAY_SIZE(wm831x_isinkv_values); i++) {
int val = wm831x_isinkv_values[i];
if (min_uA >= val && val <= max_uA) {
if (min_uA <= val && val <= max_uA) {
ret = wm831x_set_bits(wm831x, isink->reg,
WM831X_CS1_ISEL_MASK, i);
return ret;