aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-lg.c
diff options
context:
space:
mode:
authorElias Vanderstuyft <Elias.vds@gmail.com>2013-10-07 12:48:12 -0400
committerJiri Kosina <jkosina@suse.cz>2013-10-09 06:06:02 -0400
commitbd04363d3990c0727b7512a79a08c68436878bb0 (patch)
tree9cd63a4b3e5c51ac1090563bd001cddb0795fad2 /drivers/hid/hid-lg.c
parentfd848319e751739a93aa9fc8182e57e87c5a0df1 (diff)
HID: logitech - lg2ff: Add IDs for Formula Vibration Feedback Wheel
Add USB IDs for Logitech Formula Vibration Feedback Wheel (046d:ca04). The lg2ff force feedback subdriver is used for vibration and HID_GD_MULTIAXIS is set to avoid deadzone like other Logitech wheels. Kconfig description etc are also updated accordingly. Signed-off-by: Elias Vanderstuyft <Elias.vds@gmail.com> [anssi.hannula@iki.fi: added description and CCs] Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi> Signed-off-by: Simon Wood <simon@mungewell.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-lg.c')
-rw-r--r--drivers/hid/hid-lg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 6f12ecd36c88..c2c7dab7d2c4 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -492,6 +492,7 @@ static int lg_input_mapped(struct hid_device *hdev, struct hid_input *hi,
492 case USB_DEVICE_ID_LOGITECH_G27_WHEEL: 492 case USB_DEVICE_ID_LOGITECH_G27_WHEEL:
493 case USB_DEVICE_ID_LOGITECH_WII_WHEEL: 493 case USB_DEVICE_ID_LOGITECH_WII_WHEEL:
494 case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2: 494 case USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2:
495 case USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL:
495 field->application = HID_GD_MULTIAXIS; 496 field->application = HID_GD_MULTIAXIS;
496 break; 497 break;
497 default: 498 default:
@@ -639,6 +640,8 @@ static const struct hid_device_id lg_devices[] = {
639 .driver_data = LG_NOGET | LG_FF4 }, 640 .driver_data = LG_NOGET | LG_FF4 },
640 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2), 641 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOMO_WHEEL2),
641 .driver_data = LG_FF4 }, 642 .driver_data = LG_FF4 },
643 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_VIBRATION_WHEEL),
644 .driver_data = LG_FF2 },
642 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL), 645 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_G25_WHEEL),
643 .driver_data = LG_FF4 }, 646 .driver_data = LG_FF4 },
644 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL), 647 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_DFGT_WHEEL),