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-fix-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
"A small pile of fixes, none of which are super major - the code fixes
are improved error handling and fixing a leak of a device node.

We also have a typo fix and an improvement to make the binding example
for mt6359 more directly usable"

* tag 'regulator-fix-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: Kconfig: fix a typo
regulator: bq257xx: Fix device node reference leak in bq257xx_reg_dt_parse_gpio()
regulator: fp9931: Fix PM runtime reference leak in fp9931_hwmon_read()
regulator: tps65185: check devm_kzalloc() result in probe
regulator: dt-bindings: mt6359: make regulator names unique

Linus Torvalds 463e1337 201795a1

+10 -9
+2 -2
Documentation/devicetree/bindings/regulator/mt6359-regulator.yaml
··· 287 287 regulator-max-microvolt = <1700000>; 288 288 }; 289 289 mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 { 290 - regulator-name = "vrfck"; 290 + regulator-name = "vrfck_1"; 291 291 regulator-min-microvolt = <1240000>; 292 292 regulator-max-microvolt = <1600000>; 293 293 }; ··· 309 309 regulator-max-microvolt = <3300000>; 310 310 }; 311 311 mt6359_vemc_1_ldo_reg: ldo_vemc_1 { 312 - regulator-name = "vemc"; 312 + regulator-name = "vemc_1"; 313 313 regulator-min-microvolt = <2500000>; 314 314 regulator-max-microvolt = <3300000>; 315 315 };
+1 -1
drivers/regulator/Kconfig
··· 508 508 This driver supports the FP9931/JD9930 voltage regulator chip 509 509 which is used to provide power to Electronic Paper Displays 510 510 so it is found in E-Book readers. 511 - If HWWON is enabled, it also provides temperature measurement. 511 + If HWMON is enabled, it also provides temperature measurement. 512 512 513 513 config REGULATOR_LM363X 514 514 tristate "TI LM363X voltage regulators"
+1 -2
drivers/regulator/bq257xx-regulator.c
··· 115 115 return; 116 116 117 117 subchild = of_get_child_by_name(child, pdata->desc.of_match); 118 + of_node_put(child); 118 119 if (!subchild) 119 120 return; 120 - 121 - of_node_put(child); 122 121 123 122 pdata->otg_en_gpio = devm_fwnode_gpiod_get_index(&pdev->dev, 124 123 of_fwnode_handle(subchild),
+3 -4
drivers/regulator/fp9931.c
··· 144 144 return ret; 145 145 146 146 ret = regmap_read(data->regmap, FP9931_REG_TMST_VALUE, &val); 147 - if (ret) 148 - return ret; 147 + if (!ret) 148 + *temp = (s8)val * 1000; 149 149 150 150 pm_runtime_put_autosuspend(data->dev); 151 - *temp = (s8)val * 1000; 152 151 153 - return 0; 152 + return ret; 154 153 } 155 154 156 155 static umode_t fp9931_hwmon_is_visible(const void *data,
+3
drivers/regulator/tps65185.c
··· 332 332 int i; 333 333 334 334 data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); 335 + if (!data) 336 + return -ENOMEM; 337 + 335 338 data->regmap = devm_regmap_init_i2c(client, &regmap_config); 336 339 if (IS_ERR(data->regmap)) 337 340 return dev_err_probe(&client->dev, PTR_ERR(data->regmap),