Commit 5ad3cb0e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply 

Pull power supply fixes from Sebastian Reichel:

 - Kconfig dependency fix

 - bq27xxx-i2c: do not free non-existing IRQ

* tag 'for-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
  power: supply: bq27xxx-i2c: Do not free non existing IRQ
  power: supply: mm8013: select REGMAP_I2C
parents e613c90d 2df70149

drivers/power/supply/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -978,6 +978,7 @@ config CHARGER_QCOM_SMB2 
config FUEL_GAUGE_MM8013

	tristate "Mitsumi MM8013 fuel gauge driver"

	depends on I2C

	select REGMAP_I2C

	help

	  Say Y here to enable the Mitsumi MM8013 fuel gauge driver.

	  It enables the monitoring of many battery parameters, including

drivers/power/supply/bq27xxx_battery_i2c.c

+3 −1
Original line number Diff line number Diff line
@@ -209,7 +209,9 @@ static void bq27xxx_battery_i2c_remove(struct i2c_client *client) 
{

	struct bq27xxx_device_info *di = i2c_get_clientdata(client);



	if (client->irq)

		free_irq(client->irq, di);



	bq27xxx_battery_teardown(di);



	mutex_lock(&battery_mutex);