diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2020-07-17 09:43:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2020-07-17 09:43:13 -0700 |
| commit | 60541fb62438c6abd821874cfc3a24d280d1cbbf (patch) | |
| tree | 4aa511e7ec94a7c780362c59ec5a67eebd23d362 /drivers/hid/hid-logitech-hidpp.c | |
| parent | Merge tag 'sound-5.8-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | HID: logitech-hidpp: avoid repeated "multiplier = " log messages (diff) | |
| download | linux-60541fb62438c6abd821874cfc3a24d280d1cbbf.tar.gz linux-60541fb62438c6abd821874cfc3a24d280d1cbbf.tar.bz2 linux-60541fb62438c6abd821874cfc3a24d280d1cbbf.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid into master
Pull HID fixes from Jiri Kosina:
- linked list race condition fix in hid-steam driver from Rodrigo Rivas
Costa
- assorted deviceID-specific quirks and other small cosmetic cleanups
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
HID: logitech-hidpp: avoid repeated "multiplier = " log messages
HID: logitech: Use HIDPP_RECEIVER_INDEX instead of 0xff
HID: quirks: Ignore Simply Automated UPB PIM
HID: apple: Disable Fn-key key-re-mapping on clone keyboards
MAINTAINERS: update uhid and hid-wiimote entry
HID: steam: fixes race in handling device list.
HID: magicmouse: do not set up autorepeat
HID: alps: support devices with report id 2
HID: quirks: Always poll Obins Anne Pro 2 keyboard
HID: i2c-hid: add Mediacom FlexBook edge13 to descriptor override
Diffstat (limited to 'drivers/hid/hid-logitech-hidpp.c')
| -rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 1e1cf8eae649..b8b53dc95e86 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -3146,7 +3146,7 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp) multiplier = 1; hidpp->vertical_wheel_counter.wheel_multiplier = multiplier; - hid_info(hidpp->hid_dev, "multiplier = %d\n", multiplier); + hid_dbg(hidpp->hid_dev, "wheel multiplier = %d\n", multiplier); return 0; } |