Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bde83b9a authored by NeilBrown's avatar NeilBrown Committed by Anton Vorontsov
Browse files

bq27x00_battery: Fix bugs introduced with BQ27425 support 



commit a66f59ba

    bq27x00_battery: Add support for BQ27425 chip

introduced 2 bugs.

1/ 'chip' was set to BQ27425 unconditionally - breaking support for
   other devices;

2/ BQ27425 does not support cycle count, how the code still tries to
   get the cycle count for BQ27425, and now does it twice for other chips.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Cc: Saranya Gopal <saranya.gopal@intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAnton Vorontsov <anton@enomsg.org>
parent a05be991

drivers/power/bq27x00_battery.c

+0 −2
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ static void bq27x00_update(struct bq27x00_device_info *di) 
		cache.temperature = bq27x00_battery_read_temperature(di);

		if (!is_bq27425)

			cache.cycle_count = bq27x00_battery_read_cyct(di);

		cache.cycle_count = bq27x00_battery_read_cyct(di);

		cache.power_avg =

			bq27x00_battery_read_pwr_avg(di, BQ27x00_POWER_AVG);
@@ -696,7 +695,6 @@ static int bq27x00_powersupply_init(struct bq27x00_device_info *di) 
	int ret;



	di->bat.type = POWER_SUPPLY_TYPE_BATTERY;

	di->chip = BQ27425;

	if (di->chip == BQ27425) {

		di->bat.properties = bq27425_battery_props;

		di->bat.num_properties = ARRAY_SIZE(bq27425_battery_props);