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 'for-v5.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Pull power supply fixes from Sebastian Reichel:
"Three regression fixes for the 5.17 cycle:

- build warning fix for power-supply documentation

- pointer size fix in cw2015 battery driver

- OOM handling in bq256xx charger driver"

* tag 'for-v5.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: supply: bq256xx: Handle OOM correctly
power: supply: core: fix application of sizeof to pointer
power: supply: fix table problem in sysfs-class-power

Linus Torvalds 70d2bec7 7f25f041

+5 -1
+1
Documentation/ABI/testing/sysfs-class-power
··· 468 468 auto: Charge normally, respect thresholds 469 469 inhibit-charge: Do not charge while AC is attached 470 470 force-discharge: Force discharge while AC is attached 471 + ================ ==================================== 471 472 472 473 What: /sys/class/power_supply/<supply_name>/technology 473 474 Date: May 2007
+3
drivers/power/supply/bq256xx_charger.c
··· 1523 1523 BQ256XX_WDT_BIT_SHIFT); 1524 1524 1525 1525 ret = power_supply_get_battery_info(bq->charger, &bat_info); 1526 + if (ret == -ENOMEM) 1527 + return ret; 1528 + 1526 1529 if (ret) { 1527 1530 dev_warn(bq->dev, "battery info missing, default values will be applied\n"); 1528 1531
+1 -1
drivers/power/supply/cw2015_battery.c
··· 689 689 if (ret) { 690 690 /* Allocate an empty battery */ 691 691 cw_bat->battery = devm_kzalloc(&client->dev, 692 - sizeof(cw_bat->battery), 692 + sizeof(*cw_bat->battery), 693 693 GFP_KERNEL); 694 694 if (!cw_bat->battery) 695 695 return -ENOMEM;