diff options
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-lg.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 5746a5903bce..c7075d2b0786 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1293,6 +1293,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
| 1293 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) }, | 1293 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_FORCE3D_PRO) }, |
| 1294 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, | 1294 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL) }, |
| 1295 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, | 1295 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2) }, |
| 1296 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL) }, | ||
| 1296 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, | 1297 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2) }, |
| 1297 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, | 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV) }, |
| 1298 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, | 1299 | { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_NE4K) }, |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index bdeda4c7cc13..aa1b995dd033 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -292,6 +292,7 @@ | |||
| 292 | #define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286 | 292 | #define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO 0xc286 |
| 293 | #define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294 | 293 | #define USB_DEVICE_ID_LOGITECH_WHEEL 0xc294 |
| 294 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 | 294 | #define USB_DEVICE_ID_LOGITECH_MOMO_WHEEL 0xc295 |
| 295 | #define USB_DEVICE_ID_LOGITECH_G25_WHEEL 0xc299 | ||
| 295 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a | 296 | #define USB_DEVICE_ID_LOGITECH_ELITE_KBD 0xc30a |
| 296 | #define USB_DEVICE_ID_S510_RECEIVER 0xc50c | 297 | #define USB_DEVICE_ID_S510_RECEIVER 0xc50c |
| 297 | #define USB_DEVICE_ID_S510_RECEIVER_2 0xc517 | 298 | #define USB_DEVICE_ID_S510_RECEIVER_2 0xc517 |
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c index 7b80cb694982..7afbaa0efd18 100644 --- a/drivers/hid/hid-lg.c +++ b/drivers/hid/hid-lg.c | |||
| @@ -297,6 +297,8 @@ static const struct hid_device_id lg_devices[] = { | |||
| 297 | .driver_data = LG_FF }, | 297 | .driver_data = LG_FF }, |
| 298 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), | 298 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), |
| 299 | .driver_data = LG_FF }, | 299 | .driver_data = LG_FF }, |
| 300 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), | ||
| 301 | .driver_data = LG_FF }, | ||
| 300 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2), | 302 | { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2), |
| 301 | .driver_data = LG_FF2 }, | 303 | .driver_data = LG_FF2 }, |
| 302 | { } | 304 | { } |
