diff options
| author | Frank Praznik <frank.praznik@oh.rr.com> | 2014-02-15 19:35:42 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2014-02-17 23:17:36 +0100 |
| commit | a43e94a38b91e30f36e8c9ef91bf7bd93061a3a1 (patch) | |
| tree | 4f6e7bdec56d1d4e076b825b8ac6fcd0e105c602 /drivers/hid | |
| parent | HID: sony: Add conditionals to enable all features in Bluetooth mode (diff) | |
| download | linux-a43e94a38b91e30f36e8c9ef91bf7bd93061a3a1.tar.xz linux-a43e94a38b91e30f36e8c9ef91bf7bd93061a3a1.zip | |
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 <frank.praznik@oh.rr.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-sony.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |