Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43e94a3 authored by Frank Praznik's avatar Frank Praznik Committed by Jiri Kosina
Browse files

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: default avatarFrank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 68330d83

drivers/hid/hid-sony.c

+2 −2
Original line number Diff line number Diff line
@@ -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;