diff options
author | Paul Zaremba <pez-gpg@treeofice.net> | 2007-04-18 09:29:47 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2007-04-18 09:29:47 -0400 |
commit | 4d5a1be98d8d40a7c558005d423b3daed8ba1ddb (patch) | |
tree | 59e5e7da31733564429a91fcf2bb0e68fc0b278b /drivers/hid/usbhid | |
parent | f142b3a4f64eca235f5890d9cecb68482f62ed26 (diff) |
USB HID: EMS USBII device needs HID_QUIRK_MULTI_INPUT
Add HID_QUIRK_MULTI_INPUT to the EMS USBII (0x0b43/0003) so the kernel detects both joystick
ports properly. Without it you end up with a single joystick node (js0) that combines the
two physical port signals.
Signed-off-by: Paul Zaremba <pez-gpg@treeofice.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/usbhid')
-rw-r--r-- | drivers/hid/usbhid/hid-core.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 315c98cf969c..ac2493fd40cd 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c | |||
@@ -253,6 +253,9 @@ MODULE_PARM_DESC(mousepoll, "Polling interval of mice"); | |||
253 | #define USB_VENDOR_ID_PANTHERLORD 0x0810 | 253 | #define USB_VENDOR_ID_PANTHERLORD 0x0810 |
254 | #define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001 | 254 | #define USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK 0x0001 |
255 | 255 | ||
256 | #define USB_VENDOR_ID_PLAYDOTCOM 0x0b43 | ||
257 | #define USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII 0x0003 | ||
258 | |||
256 | #define USB_VENDOR_ID_SAITEK 0x06a3 | 259 | #define USB_VENDOR_ID_SAITEK 0x06a3 |
257 | #define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17 | 260 | #define USB_DEVICE_ID_SAITEK_RUMBLEPAD 0xff17 |
258 | 261 | ||
@@ -446,6 +449,7 @@ static const struct hid_blacklist { | |||
446 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, | 449 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, |
447 | 450 | ||
448 | { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS }, | 451 | { USB_VENDOR_ID_PANTHERLORD, USB_DEVICE_ID_PANTHERLORD_TWIN_USB_JOYSTICK, HID_QUIRK_MULTI_INPUT | HID_QUIRK_SKIP_OUTPUT_REPORTS }, |
452 | { USB_VENDOR_ID_PLAYDOTCOM, USB_DEVICE_ID_PLAYDOTCOM_EMS_USBII, HID_QUIRK_MULTI_INPUT }, | ||
449 | 453 | ||
450 | { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER }, | 454 | { USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER, HID_QUIRK_SONY_PS3_CONTROLLER }, |
451 | 455 | ||