diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-01-10 17:40:18 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-01-28 14:51:22 +0100 |
| commit | 85c985f46059107c4f4bf5f9e7807dbb646595db (patch) | |
| tree | ef8aeaa8751018b28b89e7eeee0877f81ec55650 /drivers | |
| parent | fe56caa97e626cc6d6e18adbd5ccd1a9aa9a4fcf (diff) | |
| download | blackbird-op-linux-85c985f46059107c4f4bf5f9e7807dbb646595db.tar.gz blackbird-op-linux-85c985f46059107c4f4bf5f9e7807dbb646595db.zip | |
HID: MS Presenter mapping for PID 0x0701
0x045e/0x0701 also needs the hid-input mapping quirk established by
quirk_microsoft_presenter_8k().
Reported-by: Jonas Delrue <jonas_delrue@hotmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-input-quirks.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/hid/hid-input-quirks.c b/drivers/hid/hid-input-quirks.c index 4bcdc9bb658e..9c4baf32dcfa 100644 --- a/drivers/hid/hid-input-quirks.c +++ b/drivers/hid/hid-input-quirks.c @@ -4,7 +4,7 @@ * This is used to handle HID-input mappings for devices violating * HUT 1.12 specification. * - * Copyright (c) 2007 Jiri Kosina + * Copyright (c) 2007-2008 Jiri Kosina */ /* @@ -296,7 +296,8 @@ static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input, #define VENDOR_ID_MICROSOFT 0x045e #define DEVICE_ID_MS4K 0x00db #define DEVICE_ID_MS6K 0x00f9 -#define DEVICE_ID_MS_PRESENTER_8K 0x0713 +#define DEVICE_IS_MS_PRESENTER_8K_BT 0x0701 +#define DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 #define VENDOR_ID_MONTEREY 0x0566 #define DEVICE_ID_GENIUS_KB29E 0x3004 @@ -324,7 +325,8 @@ static const struct hid_input_blacklist { { VENDOR_ID_MICROSOFT, DEVICE_ID_MS4K, quirk_microsoft_ergonomy_kb }, { VENDOR_ID_MICROSOFT, DEVICE_ID_MS6K, quirk_microsoft_ergonomy_kb }, - { VENDOR_ID_MICROSOFT, DEVICE_ID_MS_PRESENTER_8K, quirk_microsoft_presenter_8k }, + { VENDOR_ID_MICROSOFT, DEVICE_IS_MS_PRESENTER_8K_BT, quirk_microsoft_presenter_8k }, + { VENDOR_ID_MICROSOFT, DEVICE_ID_MS_PRESENTER_8K_USB, quirk_microsoft_presenter_8k }, { VENDOR_ID_MONTEREY, DEVICE_ID_GENIUS_KB29E, quirk_cherry_genius_29e }, |
