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 tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
"One small fix for an edge condition in the max8997 driver and a fix
for a surprise in the devres API which caused devm_regulator_put() to
not actually put the regulator - a nicer version of this based on an
improvement of the devres API is queued for 3.5."

* tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: Actually free the regulator in devm_regulator_put()
regulator: Fix the logic to ensure new voltage setting in valid range

Linus Torvalds 1eef1600 789505b0

+5 -2
+4 -1
drivers/regulator/core.c
··· 1431 1431 1432 1432 rc = devres_destroy(regulator->dev, devm_regulator_release, 1433 1433 devm_regulator_match, regulator); 1434 - WARN_ON(rc); 1434 + if (rc == 0) 1435 + regulator_put(regulator); 1436 + else 1437 + WARN_ON(rc); 1435 1438 } 1436 1439 EXPORT_SYMBOL_GPL(devm_regulator_put); 1437 1440
+1 -1
drivers/regulator/max8997.c
··· 684 684 } 685 685 686 686 new_val++; 687 - } while (desc->min + desc->step + new_val <= desc->max); 687 + } while (desc->min + desc->step * new_val <= desc->max); 688 688 689 689 new_idx = tmp_idx; 690 690 new_val = tmp_val;