diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 12:48:41 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-07 12:48:41 -0400 |
commit | b04c99e3b845892d754ee8052d6324c39c4040de (patch) | |
tree | f2bcedc7977a43b731a0b5cb1030136d40ea2c1e /drivers/hid/hid-wiimote.h | |
parent | 44598f98b98e54beca34dc836b38eaea40be1abf (diff) |
Revert "Input: introduce BTN/ABS bits for drums and guitars"
This reverts commits 61e00655e9cb, 73f8645db191 and 8e22ecb603c8:
"Input: introduce BTN/ABS bits for drums and guitars"
"HID: wiimote: add support for Guitar-Hero drums"
"HID: wiimote: add support for Guitar-Hero guitars"
The extra new ABS_xx values resulted in ABS_MAX no longer being a
power-of-two, which broke the comparison logic. It also caused the
ioctl numbers to overflow into the next byte, causing problems for that.
We'll try again for 3.13.
Reported-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: David Herrmann <dh.herrmann@gmail.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/hid/hid-wiimote.h')
-rw-r--r-- | drivers/hid/hid-wiimote.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/hid/hid-wiimote.h b/drivers/hid/hid-wiimote.h index 379cdfb6bd25..f1474f372c0b 100644 --- a/drivers/hid/hid-wiimote.h +++ b/drivers/hid/hid-wiimote.h | |||
@@ -88,8 +88,6 @@ enum wiimote_exttype { | |||
88 | WIIMOTE_EXT_CLASSIC_CONTROLLER, | 88 | WIIMOTE_EXT_CLASSIC_CONTROLLER, |
89 | WIIMOTE_EXT_BALANCE_BOARD, | 89 | WIIMOTE_EXT_BALANCE_BOARD, |
90 | WIIMOTE_EXT_PRO_CONTROLLER, | 90 | WIIMOTE_EXT_PRO_CONTROLLER, |
91 | WIIMOTE_EXT_GUITAR_HERO_DRUMS, | ||
92 | WIIMOTE_EXT_GUITAR_HERO_GUITAR, | ||
93 | WIIMOTE_EXT_NUM, | 91 | WIIMOTE_EXT_NUM, |
94 | }; | 92 | }; |
95 | 93 | ||
@@ -137,7 +135,6 @@ struct wiimote_state { | |||
137 | 135 | ||
138 | /* calibration data */ | 136 | /* calibration data */ |
139 | __u16 calib_bboard[4][3]; | 137 | __u16 calib_bboard[4][3]; |
140 | __u8 pressure_drums[7]; | ||
141 | }; | 138 | }; |
142 | 139 | ||
143 | struct wiimote_data { | 140 | struct wiimote_data { |