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

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
...@@ -978,6 +978,7 @@ config CHARGER_QCOM_SMB2 ...@@ -978,6 +978,7 @@ config CHARGER_QCOM_SMB2
config FUEL_GAUGE_MM8013 config FUEL_GAUGE_MM8013
tristate "Mitsumi MM8013 fuel gauge driver" tristate "Mitsumi MM8013 fuel gauge driver"
depends on I2C depends on I2C
select REGMAP_I2C
help help
Say Y here to enable the Mitsumi MM8013 fuel gauge driver. Say Y here to enable the Mitsumi MM8013 fuel gauge driver.
It enables the monitoring of many battery parameters, including It enables the monitoring of many battery parameters, including
......
...@@ -209,7 +209,9 @@ static void bq27xxx_battery_i2c_remove(struct i2c_client *client) ...@@ -209,7 +209,9 @@ static void bq27xxx_battery_i2c_remove(struct i2c_client *client)
{ {
struct bq27xxx_device_info *di = i2c_get_clientdata(client); struct bq27xxx_device_info *di = i2c_get_clientdata(client);
if (client->irq)
free_irq(client->irq, di); free_irq(client->irq, di);
bq27xxx_battery_teardown(di); bq27xxx_battery_teardown(di);
mutex_lock(&battery_mutex); mutex_lock(&battery_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment