| From 022b7024d4bb1f9a2f30021a2672a0f940ebfa7a Mon Sep 17 00:00:00 2001 |
| From: Dan Nicholson <dbn.lists@gmail.com> |
| Date: Fri, 17 Oct 2008 11:29:46 +0200 |
| Subject: Revert "HID: Invert HWHEEL mappings for some Logitech mice" |
| |
| From: Dan Nicholson <dbn.lists@gmail.com> |
| |
| commit 022b7024d4bb1f9a2f30021a2672a0f940ebfa7a upstream. |
| |
| This reverts commit 740f370dc61dc478d891d7d47660bb3ae39ddb4f. |
| |
| It turned out to be correct in the first place: a positive value should |
| be sent when the wheel is moved to the right, and a negative value when |
| moved to the left. This is the behavior expected by the Xorg evdev |
| driver. I must have had a remapping somewhere else in my system when |
| originally testing this. Testing on another system shows that the |
| unpatched kernel is correct. |
| |
| Here is a bug report from Mandriva that brought the problem to my |
| attention: |
| |
| https://qa.mandriva.com/show_bug.cgi?id=44309#c19 |
| |
| Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/hid/usbhid/hid-quirks.c | 4 ---- |
| 1 file changed, 4 deletions(-) |
| |
| --- a/drivers/hid/usbhid/hid-quirks.c |
| +++ b/drivers/hid/usbhid/hid-quirks.c |
| @@ -247,8 +247,6 @@ |
| #define USB_DEVICE_ID_LD_MACHINETEST 0x2040 |
| |
| #define USB_VENDOR_ID_LOGITECH 0x046d |
| -#define USB_DEVICE_ID_LOGITECH_LX3 0xc044 |
| -#define USB_DEVICE_ID_LOGITECH_V150 0xc047 |
| #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101 |
| #define USB_DEVICE_ID_LOGITECH_HARMONY 0xc110 |
| #define USB_DEVICE_ID_LOGITECH_HARMONY_2 0xc111 |
| @@ -603,8 +601,6 @@ static const struct hid_blacklist { |
| |
| { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, |
| { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP }, |
| - { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3, HID_QUIRK_INVERT_HWHEEL }, |
| - { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150, HID_QUIRK_INVERT_HWHEEL }, |
| |
| { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K, HID_QUIRK_MICROSOFT_KEYS }, |
| { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K, HID_QUIRK_MICROSOFT_KEYS }, |
