Skip to content

Commit

Permalink
Merge tag 'for-v6.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
Linus Torvalds committed Mar 2, 2024
2 parents e613c90 + 2df7014 commit 5ad3cb0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/power/supply/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion drivers/power/supply/bq27xxx_battery_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ static void bq27xxx_battery_i2c_remove(struct i2c_client *client)
{
struct bq27xxx_device_info *di = i2c_get_clientdata(client);

free_irq(client->irq, di);
if (client->irq)
free_irq(client->irq, di);

bq27xxx_battery_teardown(di);

mutex_lock(&battery_mutex);
Expand Down

0 comments on commit 5ad3cb0

Please sign in to comment.