aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/hid/hid-axff.c3
-rw-r--r--drivers/hid/hid-core.c1
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
181static const struct hid_device_id ax_devices[] = { 181static 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};
185MODULE_DEVICE_TABLE(hid, ax_devices); 186MODULE_DEVICE_TABLE(hid, ax_devices);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index d17988d178d0..c4e5cdfa5d24 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1562,6 +1562,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
1562 { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) }, 1562 { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
1563 { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, 1563 { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
1564 { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, 1564 { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
1565 { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) },
1565 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, 1566 { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
1566 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, 1567 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
1567 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) }, 1568 { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },