summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoderick Colenbrander <roderick.colenbrander@sony.com>2017-03-24 15:17:48 -0700
committerSiarhei Vishniakou <svv@google.com>2019-11-07 11:15:21 -0600
commit2e196b869bd082b8fce58854b6d9c9a170d9e7d9 (patch)
tree1fae841372fcfad5db7f1620f73ef04f62a26649
parent0bb465bb99dab64b0ada79d3eaa37e9d407af86c (diff)
UPSTREAM: HID: sony: Set proper bit flags on DS4 output report
Only set bit flags for the portions of the DS4 output report for which we have data. Signed-off-by: Roderick Colenbrander <roderick.colenbrander@sony.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> (cherry picked from commit 5caceb0695d0498b8c931cbc3cdafd99bd37b8ae) Bug: 111431828 Signed-off-by: Kim Low <kim-huei.low@sony.com> Change-Id: I9792765a4417cde21febc254e3c605cefb6b0be4 Signed-off-by: Siarhei Vishniakou <svv@google.com>
-rw-r--r--drivers/hid/hid-sony.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 3df38132eeb1..905fc09ea64d 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1993,13 +1993,13 @@ static void dualshock4_send_output_report(struct sony_sc *sc)
if (sc->quirks & (DUALSHOCK4_CONTROLLER_USB | DUALSHOCK4_DONGLE)) {
memset(buf, 0, DS4_OUTPUT_REPORT_0x05_SIZE);
buf[0] = 0x05;
- buf[1] = 0xFF;
+ buf[1] = 0x07; /* blink + LEDs + motor */
offset = 4;
} else {
memset(buf, 0, DS4_OUTPUT_REPORT_0x11_SIZE);
buf[0] = 0x11;
buf[1] = 0xC0; /* HID + CRC */
- buf[3] = 0x0F;
+ buf[3] = 0x07; /* blink + LEDs + motor */
offset = 6;
}