[PATCH] HID: sony: Correct Sixaxis battery reporting
flat view
STALE4625d
From: Frank Praznik <hidden>
Date: 2014-02-15 18:36:01
Subsystem:
hid core layer, the rest · Maintainers:
Jiri Kosina, Benjamin Tissoires, Linus Torvalds
The battery_charging and cable_state flags were backwards on the Sixaxis. The low bit of report byte 30 is 0 when charging and 1 when not. Bit 5 of byte 31 is 0 when a USB cable is connected and 1 when not. Signed-off-by: Frank Praznik <redacted> --- drivers/hid/hid-sony.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 8eac6a6..283b2a3 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c@@ -850,12 +850,12 @@ static void sixaxis_parse_report(struct sony_sc *sc, __u8 *rd, int size) */ if (rd[30] >= 0xee) { battery_capacity = 100; - battery_charging = rd[30] & 0x01; + battery_charging = !(rd[30] & 0x01); } else { battery_capacity = sixaxis_battery_capacity[rd[30]]; battery_charging = 0; } - cable_state = (rd[31] >> 4) & 0x01; + cable_state = !((rd[31] >> 4) & 0x01); spin_lock_irqsave(&sc->lock, flags); sc->cable_state = cable_state;
--
1.8.5.3