From: Frank Praznik Date: Sat, 15 Feb 2014 18:35:42 +0000 (-0500) Subject: HID: sony: Correct Sixaxis battery reporting X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a43e94a38b91e30f36e8c9ef91bf7bd93061a3a1;p=linux-beck.git HID: sony: Correct Sixaxis battery reporting 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 Signed-off-by: Jiri Kosina --- diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 947d2088a700..0111d3028c4b 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -845,12 +845,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;