mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 14:30:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'regulator-fix-v7.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Browse Source 
Pull regulator fixes from Mark Brown:
 "A couple of straightforward fixes for device loading, plus a fix for
  the core support for keeping multiple regulators with voltages close
  to each other that was sadly introduced due to one of the more
  beautiful corners of our API design"

* tag 'regulator-fix-v7.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: regulator_lock_two() should test for EDEADLK not EDEADLOCK
  regulator: mt6363: add missing MODULE_DEVICE_TABLE()
  regulator: mt6316: add missing MODULE_DEVICE_TABLE()
This commit is contained in:
Linus Torvalds
2026-07-10 19:07:24 -07:00
parent bf124bae08 d38f8bd771
commit dd3210c47e
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/core.c
View File

@@ -248,7 +248,7 @@ static void regulator_lock_two(struct regulator_dev *rdev1,
ret = regulator_lock_nested(rdev1, ww_ctx);
WARN_ON(ret);
ret = regulator_lock_nested(rdev2, ww_ctx);
if (ret != -EDEADLOCK) {
if (ret != -EDEADLK) {
WARN_ON(ret);
goto exit;
}
@@ -264,7 +264,7 @@ static void regulator_lock_two(struct regulator_dev *rdev1,
swap(held, contended);
ret = regulator_lock_nested(contended, ww_ctx);
if (ret != -EDEADLOCK) {
if (ret != -EDEADLK) {
WARN_ON(ret);
break;
}

1
drivers/regulator/mt6316-regulator.c
View File

@@ -329,6 +329,7 @@ static const struct of_device_id mt6316_regulator_match[] = {
{ .compatible = "mediatek,mt6316d-regulator", .data = (void *)MT6316_TYPE_4PHASE },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mt6316_regulator_match);
static struct spmi_driver mt6316_regulator_driver = {
.driver = {

1
drivers/regulator/mt6363-regulator.c
View File

@@ -927,6 +927,7 @@ static const struct of_device_id mt6363_regulator_match[] = {
{ .compatible = "mediatek,mt6363-regulator" },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mt6363_regulator_match);
static struct platform_driver mt6363_regulator_driver = {
.driver = {