diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-06-13 16:08:18 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-06-14 04:46:51 -0400 |
commit | f3b83d71a1b1a1569dba774c3a4f6e2a3b9fef99 (patch) | |
tree | 512d9d22e095f4d8d1f695b2e293776c56ec8338 | |
parent | c9e4d87758e95ef9d78a7767e2405ebaf54adcd8 (diff) |
HID: add support for MS Digital Media 3000
The Digital Media 3000 keyboard (USB id: 0x0730) features the same 1-5
Application Launch keys that the Natural Ergonomic 4000 has. Add its
usb id to the list of quirks.
Reported-by: Khelben Blackstaff <eye.of.the.8eholder@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
-rw-r--r-- | drivers/hid/hid-microsoft.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index d93d8c0ab10f..3b6af7cc9841 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1428,6 +1428,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1428 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, | 1428 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, |
1429 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) }, | 1429 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_LK6K) }, |
1430 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, | 1430 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB) }, |
1431 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K) }, | ||
1431 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, | 1432 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0) }, |
1432 | { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, | 1433 | { HID_USB_DEVICE(USB_VENDOR_ID_MONTEREY, USB_DEVICE_ID_GENIUS_KB29E) }, |
1433 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, | 1434 | { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index cc298cbc90f2..e8faee4621e4 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
@@ -468,6 +468,7 @@ | |||
468 | #define USB_DEVICE_ID_MS_LK6K 0x00f9 | 468 | #define USB_DEVICE_ID_MS_LK6K 0x00f9 |
469 | #define USB_DEVICE_ID_MS_PRESENTER_8K_BT 0x0701 | 469 | #define USB_DEVICE_ID_MS_PRESENTER_8K_BT 0x0701 |
470 | #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 | 470 | #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 |
471 | #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K 0x0730 | ||
471 | 472 | ||
472 | #define USB_VENDOR_ID_MOJO 0x8282 | 473 | #define USB_VENDOR_ID_MOJO 0x8282 |
473 | #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 | 474 | #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 |
diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 0f6fc54dc196..df91791f88d3 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c | |||
@@ -179,6 +179,8 @@ static const struct hid_device_id ms_devices[] = { | |||
179 | .driver_data = MS_ERGONOMY | MS_RDESC }, | 179 | .driver_data = MS_ERGONOMY | MS_RDESC }, |
180 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB), | 180 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_USB), |
181 | .driver_data = MS_PRESENTER }, | 181 | .driver_data = MS_PRESENTER }, |
182 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3K), | ||
183 | .driver_data = MS_ERGONOMY }, | ||
182 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0), | 184 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0), |
183 | .driver_data = MS_NOGET }, | 185 | .driver_data = MS_NOGET }, |
184 | 186 | ||