diff options
| -rw-r--r-- | drivers/hid/hid-sony.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 75da56d0cfac..96a8ec5ed296 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * HID driver for Sony / PS2 / PS3 BD devices. | 2 | * HID driver for Sony / PS2 / PS3 / PS4 BD devices. |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 1999 Andreas Gal | 4 | * Copyright (c) 1999 Andreas Gal |
| 5 | * Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz> | 5 | * Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz> |
| @@ -8,6 +8,7 @@ | |||
| 8 | * Copyright (c) 2012 David Dillow <dave@thedillows.org> | 8 | * Copyright (c) 2012 David Dillow <dave@thedillows.org> |
| 9 | * Copyright (c) 2006-2013 Jiri Kosina | 9 | * Copyright (c) 2006-2013 Jiri Kosina |
| 10 | * Copyright (c) 2013 Colin Leitner <colin.leitner@gmail.com> | 10 | * Copyright (c) 2013 Colin Leitner <colin.leitner@gmail.com> |
| 11 | * Copyright (c) 2014 Frank Praznik <frank.praznik@gmail.com> | ||
| 11 | */ | 12 | */ |
| 12 | 13 | ||
| 13 | /* | 14 | /* |
| @@ -395,11 +396,11 @@ static u8 dualshock4_usb_rdesc[] = { | |||
| 395 | 396 | ||
| 396 | /* | 397 | /* |
| 397 | * The default behavior of the Dualshock 4 is to send reports using report | 398 | * The default behavior of the Dualshock 4 is to send reports using report |
| 398 | * type 1 when running over Bluetooth. However, as soon as it receives a | 399 | * type 1 when running over Bluetooth. However, when feature report 2 is |
| 399 | * report of type 17 to set the LEDs or rumble it starts returning it's state | 400 | * requested during the controller initialization it starts sending input |
| 400 | * in report 17 instead of 1. Since report 17 is undefined in the default HID | 401 | * reports in report 17. Since report 17 is undefined in the default HID |
| 401 | * descriptor the button and axis definitions must be moved to report 17 or | 402 | * descriptor the button and axis definitions must be moved to report 17 or |
| 402 | * the HID layer won't process the received input once a report is sent. | 403 | * the HID layer won't process the received input. |
| 403 | */ | 404 | */ |
| 404 | static u8 dualshock4_bt_rdesc[] = { | 405 | static u8 dualshock4_bt_rdesc[] = { |
| 405 | 0x05, 0x01, /* Usage Page (Desktop), */ | 406 | 0x05, 0x01, /* Usage Page (Desktop), */ |
