Skip to content

Commit 5ad3cb0

Browse files
committed
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
2 parents e613c90 + 2df7014 commit 5ad3cb0

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/power/supply/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@ config CHARGER_QCOM_SMB2
978978
config FUEL_GAUGE_MM8013
979979
tristate "Mitsumi MM8013 fuel gauge driver"
980980
depends on I2C
981+
select REGMAP_I2C
981982
help
982983
Say Y here to enable the Mitsumi MM8013 fuel gauge driver.
983984
It enables the monitoring of many battery parameters, including

drivers/power/supply/bq27xxx_battery_i2c.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ static void bq27xxx_battery_i2c_remove(struct i2c_client *client)
209209
{
210210
struct bq27xxx_device_info *di = i2c_get_clientdata(client);
211211

212-
free_irq(client->irq, di);
212+
if (client->irq)
213+
free_irq(client->irq, di);
214+
213215
bq27xxx_battery_teardown(di);
214216

215217
mutex_lock(&battery_mutex);

0 commit comments

Comments
 (0)