Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e031ab3 authored by Charles Keepax's avatar Charles Keepax Committed by Greg Kroah-Hartman
Browse files

i2c: Clear client->irq in i2c_device_remove 



commit 6f108dd70d3010c391c1e9f56f3f20d1f9e75450 upstream.

The IRQ will be mapped in i2c_device_probe only if client->irq is zero and
i2c_device_remove does not clear this. When rebinding an I2C device,
whos IRQ provider has also been rebound this means that an IRQ mapping
will never be created, causing the I2C device to fail to acquire its
IRQ. Fix this issue by clearing client->irq in i2c_device_remove,
forcing i2c_device_probe to lookup the mapping again.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63eab25e

drivers/i2c/i2c-core-base.c

+2 −0
Original line number Diff line number Diff line
@@ -430,6 +430,8 @@ static int i2c_device_remove(struct device *dev) 
	dev_pm_clear_wake_irq(&client->dev);

	device_init_wakeup(&client->dev, false);



	client->irq = 0;



	return status;

}