mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'for-v5.17-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply

Browse Source 
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
This commit is contained in:
Linus Torvalds
2022-02-20 11:07:46 -08:00
parent 7f25f0412c f444578d72
commit 70d2bec7c5
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/ABI/testing/sysfs-class-power
View File

@@ -468,6 +468,7 @@ Description:
auto: Charge normally, respect thresholds auto: Charge normally, respect thresholds
inhibit-charge: Do not charge while AC is attached inhibit-charge: Do not charge while AC is attached
force-discharge: Force discharge while AC is attached force-discharge: Force discharge while AC is attached
================ ====================================
What: /sys/class/power_supply/<supply_name>/technology What: /sys/class/power_supply/<supply_name>/technology
Date: May 2007 Date: May 2007

3
drivers/power/supply/bq256xx_charger.c
View File

@@ -1523,6 +1523,9 @@ static int bq256xx_hw_init(struct bq256xx_device *bq)
BQ256XX_WDT_BIT_SHIFT); BQ256XX_WDT_BIT_SHIFT);
ret = power_supply_get_battery_info(bq->charger, &bat_info); ret = power_supply_get_battery_info(bq->charger, &bat_info);
if (ret == -ENOMEM)
return ret;
if (ret) { if (ret) {
dev_warn(bq->dev, "battery info missing, default values will be applied\n"); dev_warn(bq->dev, "battery info missing, default values will be applied\n");

2
drivers/power/supply/cw2015_battery.c
View File

@@ -689,7 +689,7 @@ static int cw_bat_probe(struct i2c_client *client)
if (ret) { if (ret) {
/* Allocate an empty battery */ /* Allocate an empty battery */
cw_bat->battery = devm_kzalloc(&client->dev, cw_bat->battery = devm_kzalloc(&client->dev,
sizeof(cw_bat->battery), sizeof(*cw_bat->battery),
GFP_KERNEL); GFP_KERNEL);
if (!cw_bat->battery) if (!cw_bat->battery)
return -ENOMEM; return -ENOMEM;