Merge branch 'i2c/for-mergewindow' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / hid / hid-multitouch.c

diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
index 2e4fb76..3ea7cb1 100644 (file)
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
@@ -1768,7 +1768,8 @@ static int mt_suspend(struct hid_device *hdev, pm_message_t state)
        struct mt_device *td = hid_get_drvdata(hdev);
 
        /* High latency is desirable for power savings during S3/S0ix */
-       if (td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP)
+       if ((td->mtclass.quirks & MT_QUIRK_DISABLE_WAKEUP) ||
+           !hid_hw_may_wakeup(hdev))
                mt_set_modes(hdev, HID_LATENCY_HIGH, false, false);
        else
                mt_set_modes(hdev, HID_LATENCY_HIGH, true, true);