aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-lg.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid/hid-lg.c')
-rw-r--r--drivers/hid/hid-lg.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 55ce2bfe51fa..a2f8e88b9fa2 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -341,6 +341,9 @@ static int lg_event(struct hid_device *hdev, struct hid_field *field,
341 -value); 341 -value);
342 return 1; 342 return 1;
343 } 343 }
344 if (drv_data->quirks & LG_FF4) {
345 return lg4ff_adjust_input_event(hdev, field, usage, value, drv_data);
346 }
344 347
345 return 0; 348 return 0;
346} 349}
@@ -357,7 +360,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
357 return -ENOMEM; 360 return -ENOMEM;
358 } 361 }
359 drv_data->quirks = id->driver_data; 362 drv_data->quirks = id->driver_data;
360 363
361 hid_set_drvdata(hdev, (void *)drv_data); 364 hid_set_drvdata(hdev, (void *)drv_data);
362 365
363 if (drv_data->quirks & LG_NOGET) 366 if (drv_data->quirks & LG_NOGET)
@@ -379,7 +382,7 @@ static int lg_probe(struct hid_device *hdev, const struct hid_device_id *id)
379 } 382 }
380 383
381 /* Setup wireless link with Logitech Wii wheel */ 384 /* Setup wireless link with Logitech Wii wheel */
382 if(hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) { 385 if (hdev->product == USB_DEVICE_ID_LOGITECH_WII_WHEEL) {
383 unsigned char buf[] = { 0x00, 0xAF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; 386 unsigned char buf[] = { 0x00, 0xAF, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
384 387
385 ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT); 388 ret = hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);
@@ -475,7 +478,7 @@ static const struct hid_device_id lg_devices[] = {
475 .driver_data = LG_NOGET | LG_FF4 }, 478 .driver_data = LG_NOGET | LG_FF4 },
476 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL), 479 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WII_WHEEL),
477 .driver_data = LG_FF4 }, 480 .driver_data = LG_FF4 },
478 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG ), 481 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WINGMAN_FFG),
479 .driver_data = LG_FF }, 482 .driver_data = LG_FF },
480 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2), 483 { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD2),
481 .driver_data = LG_FF2 }, 484 .driver_data = LG_FF2 },