Created
November 11, 2013 01:36
-
-
Save d4l3k/7406389 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -uprN -X linux-3.12-rc7-vanilla/Documentation/dontdiff linux-3.12-rc7-vanilla/drivers/hid/hid-axff.c linux-3.12-rc7/drivers/hid/hid-axff.c | |
--- linux-3.12-rc7-vanilla/drivers/hid/hid-axff.c 2013-10-27 16:12:03.000000000 -0700 | |
+++ linux-3.12-rc7/drivers/hid/hid-axff.c 2013-10-30 22:23:55.172586734 -0700 | |
@@ -95,7 +95,7 @@ static int axff_init(struct hid_device * | |
} | |
} | |
- if (field_count < 4) { | |
+ if (field_count < 4 && hid->product != 0xf705) { | |
hid_err(hid, "not enough fields in the report: %d\n", | |
field_count); | |
return -ENODEV; | |
@@ -180,6 +180,7 @@ static void ax_remove(struct hid_device | |
static const struct hid_device_id ax_devices[] = { | |
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), }, | |
+ { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705), }, | |
{ } | |
}; | |
MODULE_DEVICE_TABLE(hid, ax_devices); | |
diff -uprN -X linux-3.12-rc7-vanilla/Documentation/dontdiff linux-3.12-rc7-vanilla/drivers/hid/hid-core.c linux-3.12-rc7/drivers/hid/hid-core.c | |
--- linux-3.12-rc7-vanilla/drivers/hid/hid-core.c 2013-10-27 16:12:03.000000000 -0700 | |
+++ linux-3.12-rc7/drivers/hid/hid-core.c 2013-10-30 15:47:35.360325461 -0700 | |
@@ -1605,6 +1605,7 @@ static const struct hid_device_id hid_ha | |
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, | |
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, | |
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, | |
+ { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) }, | |
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, | |
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, | |
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) }, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment