diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 10:15:15 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 10:15:15 +0300 |
| commit | b3e29642548258c7cd2cb3326a776fff84cd6b69 (patch) | |
| tree | 1c5da8119d9792ebf4d11ea4787c7529e97c8e53 /drivers/hid/hid-logitech-dj.c | |
| parent | 8f4ef88ebadefcf16b7f616f8af940465c44bea2 (diff) | |
| parent | 498d0ddc6ae931e4e79a57c56b6dd4576aa435b6 (diff) | |
| download | linux-b3e29642548258c7cd2cb3326a776fff84cd6b69.tar.xz | |
Merge branch 'for-5.14/multitouch' into for-linus
- patch series that ensures that hid-multitouch driver disables touch and
button-press reporting on hid-mt devices during suspend when the device is
not configured as a wakeup-source, from Hans de Goede
Diffstat (limited to 'drivers/hid/hid-logitech-dj.c')
| -rw-r--r-- | drivers/hid/hid-logitech-dj.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c index 18d37b3765f3..a0017b010c34 100644 --- a/drivers/hid/hid-logitech-dj.c +++ b/drivers/hid/hid-logitech-dj.c @@ -1497,6 +1497,13 @@ static void logi_dj_ll_stop(struct hid_device *hid) dbg_hid("%s\n", __func__); } +static bool logi_dj_ll_may_wakeup(struct hid_device *hid) +{ + struct dj_device *djdev = hid->driver_data; + struct dj_receiver_dev *djrcv_dev = djdev->dj_receiver_dev; + + return hid_hw_may_wakeup(djrcv_dev->hidpp); +} static struct hid_ll_driver logi_dj_ll_driver = { .parse = logi_dj_ll_parse, @@ -1505,6 +1512,7 @@ static struct hid_ll_driver logi_dj_ll_driver = { .open = logi_dj_ll_open, .close = logi_dj_ll_close, .raw_request = logi_dj_ll_raw_request, + .may_wakeup = logi_dj_ll_may_wakeup, }; static int logi_dj_dj_event(struct hid_device *hdev, |