]> git.itanic.dy.fi Git - linux-stable/commitdiff
power: supply: bq27xxx-i2c: Do not free non existing IRQ
authorHans de Goede <hdegoede@redhat.com>
Thu, 15 Feb 2024 15:51:33 +0000 (16:51 +0100)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Fri, 16 Feb 2024 22:42:38 +0000 (23:42 +0100)
The bq27xxx i2c-client may not have an IRQ, in which case
client->irq will be 0. bq27xxx_battery_i2c_probe() already has
an if (client->irq) check wrapping the request_threaded_irq().

But bq27xxx_battery_i2c_remove() unconditionally calls
free_irq(client->irq) leading to:

[  190.310742] ------------[ cut here ]------------
[  190.310843] Trying to free already-free IRQ 0
[  190.310861] WARNING: CPU: 2 PID: 1304 at kernel/irq/manage.c:1893 free_irq+0x1b8/0x310

Followed by a backtrace when unbinding the driver. Add
an if (client->irq) to bq27xxx_battery_i2c_remove() mirroring
probe() to fix this.

Fixes: 444ff00734f3 ("power: supply: bq27xxx: Fix I2C IRQ race on remove")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240215155133.70537-1-hdegoede@redhat.com
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/bq27xxx_battery_i2c.c

index 3a1798b0c1a79f3ed3a3fd0be4d84f6df390b3b4..9910c600743ebd9b9e01a1cb393c0378ae837807 100644 (file)
@@ -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);