]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
i2c: Clear client->irq in i2c_device_remove
authorCharles Keepax <ckeepax@opensource.cirrus.com>
Fri, 19 Oct 2018 08:59:58 +0000 (09:59 +0100)
committerWolfram Sang <wsa@the-dreams.de>
Wed, 31 Oct 2018 23:33:34 +0000 (23:33 +0000)
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: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/i2c-core-base.c

index 656f0a6fe3adf6917996c48fffef71bc3700351f..28460f6a60cc15220c9a8748b3bd688e81244c37 100644 (file)
@@ -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;
 }