Commit af4739c2 authored by Gabriele Mazzotta's avatar Gabriele Mazzotta Committed by Jiri Kosina
Browse files

HID: i2c-hid: Call device suspend callback before disabling irq

i2c-hid takes care of requesting and handling IRQs for HID devices
which in turns might expect them to be always active when working
in normal conditions. Hence, disabling IRQs before calling the suspend
callbacks can potentially cause problems since device drivers might
try to perform operations needing them.

Fix this by disabling IRQs only after the suspend callbacks had been
Signed-off-by: default avatarGabriele Mazzotta <>
Reviewed-by: default avatarBenjamin Tissoires <>
Signed-off-by: default avatarJiri Kosina <>
parent 67db8a80
......@@ -1092,13 +1092,13 @@ static int i2c_hid_suspend(struct device *dev)
struct hid_device *hid = ihid->hid;
int ret = 0;
if (hid->driver && hid->driver->suspend)
ret = hid->driver->suspend(hid, PMSG_SUSPEND);
if (device_may_wakeup(&client->dev))
if (hid->driver && hid->driver->suspend)
ret = hid->driver->suspend(hid, PMSG_SUSPEND);
/* Save some power */
i2c_hid_set_power(client, I2C_HID_PWR_SLEEP);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment