summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moreau <oreaus@gmail.com>2016-01-13 07:40:43 -0700
committerSiarhei Vishniakou <svv@google.com>2019-11-07 11:12:06 -0600
commit8885ee1834996ca3a360fdcbb7292b3d6c967257 (patch)
tree104f6526b17c23bed86687adffe9171117c3dc38
parent3747324fca890d0f445bc7663262aeeff1815f72 (diff)
UPSTREAM: HID: sony: Fixup output reports for the nyko core controller
The nyko core controller uses the same output report format as the sixaxis controllers, but it expects the report id at offset 1. This does not interfere with the official controllers as this byte is considered a padding byte by the current code. Signed-off-by: Scott Moreau <oreaus@gmail.com> Acked-by: Antonio Ospite <ao2@ao2.it> Signed-off-by: Jiri Kosina <jkosina@suse.cz> (cherry picked from commit ad07b7a6cf8898e1ec76a2641f6186c80d0b8a29) Bug: 111431828 Signed-off-by: Kim Low <kim-huei.low@sony.com> Change-Id: I7f72917bc229fb1a0600979f3e81aab53c5bad2d Signed-off-by: Siarhei Vishniakou <svv@google.com>
-rw-r--r--drivers/hid/hid-sony.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 94be9b18e1e3..546bde6850a3 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1798,7 +1798,7 @@ static void sixaxis_send_output_report(struct sony_sc *sc)
static const union sixaxis_output_report_01 default_report = {
.buf = {
0x01,
- 0x00, 0xff, 0x00, 0xff, 0x00,
+ 0x01, 0xff, 0x00, 0xff, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00,
0xff, 0x27, 0x10, 0x00, 0x32,
0xff, 0x27, 0x10, 0x00, 0x32,