diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2013-09-01 09:31:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-09-04 04:50:41 -0400 |
| commit | 8c89cc17b91992845bd635813cd162fe8dfcec6e (patch) | |
| tree | cce5d95a3a9c28cc658646b6b1710d77088f8729 | |
| parent | efd15f5f4ff63f6ac5d80850686e3d2cc8c4481b (diff) | |
HID: Correct the USB IDs for the new Macbook Air 6
A recent patch (9d9a04ee) added support for the new machine, but got
the sequence of USB ids wrong. Reports from both Ian and Linus T show
that the 0x0291 id is for ISO, not ANSI, which should have the missing
number 0x0290. This patchs moves the three numbers accordingly, fixing
the problem.
Reported-and-tested-by: Ian Munsie <darkstarsword@gmail.com>
Tested-by: Linus G Thiel <linus@hanssonlarsson.se>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-ids.h | 6 | ||||
| -rw-r--r-- | drivers/input/mouse/bcm5974.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 9386df57f195..e60e8d530697 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -135,9 +135,9 @@ | |||
| 135 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b | 135 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b |
| 136 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI 0x0255 | 136 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI 0x0255 |
| 137 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256 | 137 | #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256 |
| 138 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291 | 138 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290 |
| 139 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292 | 139 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291 |
| 140 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293 | 140 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292 |
| 141 | #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a | 141 | #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a |
| 142 | #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b | 142 | #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b |
| 143 | #define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240 | 143 | #define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240 |
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c index 4ef4d5e198ae..a73f9618b0ad 100644 --- a/drivers/input/mouse/bcm5974.c +++ b/drivers/input/mouse/bcm5974.c | |||
| @@ -89,9 +89,9 @@ | |||
| 89 | #define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a | 89 | #define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a |
| 90 | #define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b | 90 | #define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b |
| 91 | /* MacbookAir6,2 (unibody, June 2013) */ | 91 | /* MacbookAir6,2 (unibody, June 2013) */ |
| 92 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291 | 92 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290 |
| 93 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292 | 93 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291 |
| 94 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293 | 94 | #define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292 |
| 95 | 95 | ||
| 96 | #define BCM5974_DEVICE(prod) { \ | 96 | #define BCM5974_DEVICE(prod) { \ |
| 97 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ | 97 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ |