Commit 70d2bec7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7f25f041 f444578d

Documentation/ABI/testing/sysfs-class-power

+1 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ Description: 
			auto:            Charge normally, respect thresholds

			inhibit-charge:  Do not charge while AC is attached

			force-discharge: Force discharge while AC is attached

			================ ====================================



What:		/sys/class/power_supply/<supply_name>/technology

Date:		May 2007

drivers/power/supply/bq256xx_charger.c

+3 −0
Original line number Diff line number Diff line
@@ -1523,6 +1523,9 @@ static int bq256xx_hw_init(struct bq256xx_device *bq) 
						BQ256XX_WDT_BIT_SHIFT);



	ret = power_supply_get_battery_info(bq->charger, &bat_info);

	if (ret == -ENOMEM)

		return ret;



	if (ret) {

		dev_warn(bq->dev, "battery info missing, default values will be applied\n");

drivers/power/supply/cw2015_battery.c

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int cw_bat_probe(struct i2c_client *client) 
	if (ret) {

		/* Allocate an empty battery */

		cw_bat->battery = devm_kzalloc(&client->dev,

					       sizeof(cw_bat->battery),

					       sizeof(*cw_bat->battery),

					       GFP_KERNEL);

		if (!cw_bat->battery)

			return -ENOMEM;