summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-input.c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-06-23 22:54:08 +0200
committerJiri Kosina <jkosina@suse.cz>2008-10-14 23:50:51 +0200
commit0f2213208f8da51bcb665309e3468f000489c04f (patch)
treec4ae130d095b019bb0c1492966d41e5bd4a2a1c5 /drivers/hid/hid-input.c
parent90231e7eaf752856a2c13f786f36ec7f641bad28 (diff)
downloadblackbird-op-linux-0f2213208f8da51bcb665309e3468f000489c04f.tar.gz
blackbird-op-linux-0f2213208f8da51bcb665309e3468f000489c04f.zip
HID: move cypress quirks
Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-input.c')
-rw-r--r--drivers/hid/hid-input.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index a6223bc5c734..f1df25ab0baa 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -515,13 +515,13 @@ mapped:
hidinput, field, usage, &bit, &max) < 0)
goto ignore;
- if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 | HID_QUIRK_2WHEEL_MOUSE_HACK_5 |
+ if ((device->quirks & (HID_QUIRK_2WHEEL_MOUSE_HACK_7 |
HID_QUIRK_2WHEEL_MOUSE_HACK_B8)) && (usage->type == EV_REL) &&
(usage->code == REL_WHEEL))
set_bit(REL_HWHEEL, bit);
- if (((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_5) && (usage->hid == 0x00090005))
- || ((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) && (usage->hid == 0x00090007)))
+ if ((device->quirks & HID_QUIRK_2WHEEL_MOUSE_HACK_7) &&
+ (usage->hid == 0x00090007))
goto ignore;
set_bit(usage->type, input->evbit);
OpenPOWER on IntegriCloud