summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVojtech Pavlik <vojtech@suse.cz>2005-09-05 00:07:37 -0500
committerDmitry Torokhov <dtor_core@ameritech.net>2005-09-05 00:07:37 -0500
commitb8c9c642db4ab0811cc5bb0d8b90cc7819055c95 (patch)
tree1d515ed2b342c882b94db8f654466d7d27cb08d6
parent7545c24c6a6ab62922266197a72119212280ea2a (diff)
Inpur: recognize and ignore Logitech vendor usages in HID
These get in our way with MX mice. Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--drivers/usb/input/hid-input.c1
-rw-r--r--drivers/usb/input/hid.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index 63a4db721f7..3b162a19d7b 100644
--- a/drivers/usb/input/hid-input.c
+++ b/drivers/usb/input/hid-input.c
@@ -296,6 +296,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
break;
case HID_UP_MSVENDOR:
+ case HID_UP_LOGIVENDOR:
goto ignore;
diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h
index c1b6b69bc4a..f3b85a0c200 100644
--- a/drivers/usb/input/hid.h
+++ b/drivers/usb/input/hid.h
@@ -182,6 +182,7 @@ struct hid_item {
#define HID_UP_PID 0x000f0000
#define HID_UP_HPVENDOR 0xff7f0000
#define HID_UP_MSVENDOR 0xff000000
+#define HID_UP_LOGIVENDOR 0x00ff0000
#define HID_USAGE 0x0000ffff