Commit 3c8853c9 authored by Hans de Goede's avatar Hans de Goede Committed by Guo Mengqi
Browse files

power: supply: bq27xxx-i2c: Do not free non existing IRQ 

stable inclusion
from stable-v5.10.212
commit d7acc4a569f5f4513120c85ea2b9f04909b7490f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9Q8ME

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d7acc4a569f5f4513120c85ea2b9f04909b7490f



--------------------------------

[ Upstream commit 2df70149e73e79783bcbc7db4fa51ecef0e2022c ]

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: 444ff007 ("power: supply: bq27xxx: Fix I2C IRQ race on remove")
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20240215155133.70537-1-hdegoede@redhat.com


Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWang Hai <wanghai38@huawei.com>
parent 223a7beb

drivers/power/supply/bq27xxx_battery_i2c.c

+3 −1
Original line number Diff line number Diff line
@@ -209,7 +209,9 @@ static int 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);