diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 15:44:08 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-02-14 15:44:08 +0300 |
| commit | c4a07e264d38d5cad5d77298957cbd7d7db70b1f (patch) | |
| tree | bf7d4da0dadc50248951c643ca4f3f16a6ef8d04 /drivers/hid/hid-logitech-hidpp.c | |
| parent | f87b564686ee47c480ccacc3922b38a8c54a6945 (diff) | |
| parent | ceaa837f96adb69c0df0397937cd74991d5d821a (diff) | |
| download | linux-c4a07e264d38d5cad5d77298957cbd7d7db70b1f.tar.xz | |
Merge 6.2-rc8 into usb-next
We need the USB fixes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hid/hid-logitech-hidpp.c')
| -rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index abf2c95e4d0b..9c1ee8e91e0c 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -3978,7 +3978,8 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) } hidpp_initialize_battery(hidpp); - hidpp_initialize_hires_scroll(hidpp); + if (!hid_is_usb(hidpp->hid_dev)) + hidpp_initialize_hires_scroll(hidpp); /* forward current battery state */ if (hidpp->capabilities & HIDPP_CAPABILITY_HIDPP10_BATTERY) { |