]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
i2c: Allow recovery of the initial IRQ by an I2C client device.
authorJim Broadus <jbroadus@gmail.com>
Tue, 19 Feb 2019 19:30:27 +0000 (11:30 -0800)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 14 May 2019 18:55:24 +0000 (20:55 +0200)
commitffb13e9daa2ce4d8ecd2ffe808b7cdc8c9f79f73
tree420e2124e5e60cd1cc09a125498e3ec4045a5bd6
parent938761beac86dcaebcfd10a61703942ed2414688
i2c: Allow recovery of the initial IRQ by an I2C client device.

BugLink: https://bugs.launchpad.net/bugs/1828410
[ Upstream commit 93b6604c5a669d84e45fe5129294875bf82eb1ff ]

A previous change allowed I2C client devices to discover new IRQs upon
reprobe by clearing the IRQ in i2c_device_remove. However, if an IRQ was
assigned in i2c_new_device, that information is lost.

For example, the touchscreen and trackpad devices on a Dell Inspiron laptop
are I2C devices whose IRQs are defined by ACPI extended IRQ types. The
client device structures are initialized during an ACPI walk. After
removing the i2c_hid device, modprobe fails.

This change caches the initial IRQ value in i2c_new_device and then resets
the client device IRQ to the initial value in i2c_device_remove.

Fixes: 6f108dd70d30 ("i2c: Clear client->irq in i2c_device_remove")
Signed-off-by: Jim Broadus <jbroadus@gmail.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
[wsa: this is an easy to backport fix for the regression. We will
refactor the code to handle irq assignments better in general.]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/i2c/i2c-core-base.c
include/linux/i2c.h