diff options
author | Tristan Rice <rice@outerearth.net> | 2013-11-12 13:06:23 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2013-11-12 13:06:23 -0500 |
commit | e17f5d7667c5414b8f12a93ef14aae0824bd2beb (patch) | |
tree | e3f44441a43be40e47a5e2bf6a3eeb2244ca8935 | |
parent | a08c22c0df0ad23d0df10ae1a9df26643589b3cc (diff) |
HID: enable Mayflash USB Gamecube Adapter
This is a patch that adds the new Mayflash Gamecube Controller to USB adapter
(ID 1a34:f705 ACRUX) to the ACRUX driver (drivers/hid/hid-axff.c) with full
force feedback support.
Signed-off-by: Tristan Rice <rice@outerearth.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r-- | drivers/hid/hid-axff.c | 3 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c index 64ab94a55aa7..a594e478a1e2 100644 --- a/drivers/hid/hid-axff.c +++ b/drivers/hid/hid-axff.c | |||
@@ -95,7 +95,7 @@ static int axff_init(struct hid_device *hid) | |||
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
98 | if (field_count < 4) { | 98 | if (field_count < 4 && hid->product != 0xf705) { |
99 | hid_err(hid, "not enough fields in the report: %d\n", | 99 | hid_err(hid, "not enough fields in the report: %d\n", |
100 | field_count); | 100 | field_count); |
101 | return -ENODEV; | 101 | return -ENODEV; |
@@ -180,6 +180,7 @@ static void ax_remove(struct hid_device *hdev) | |||
180 | 180 | ||
181 | static const struct hid_device_id ax_devices[] = { | 181 | static const struct hid_device_id ax_devices[] = { |
182 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), }, | 182 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), }, |
183 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705), }, | ||
183 | { } | 184 | { } |
184 | }; | 185 | }; |
185 | MODULE_DEVICE_TABLE(hid, ax_devices); | 186 | MODULE_DEVICE_TABLE(hid, ax_devices); |
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 3dd1217ff1bc..4c2f3b4ffa30 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
@@ -1602,6 +1602,7 @@ static const struct hid_device_id hid_have_special_driver[] = { | |||
1602 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, | 1602 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, |
1603 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, | 1603 | { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, |
1604 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, | 1604 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, |
1605 | { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) }, | ||
1605 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, | 1606 | { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, |
1606 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, | 1607 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, |
1607 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) }, | 1608 | { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) }, |