Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8c89cc17b91992845bd635813cd162fe8dfcec6e

Authored by Henrik Rydberg
Committed by Jiri Kosina
1 parent efd15f5f4f
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/hid/hid-ids.h
Diff comments   View file @ 8c89cc1
... ... @@ -135,9 +135,9 @@
135 135 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
136 136 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI 0x0255
137 137 #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256
138   -#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291
139   -#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292
140   -#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293
  138 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290
  139 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291
  140 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292
141 141 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
142 142 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
143 143 #define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240
drivers/input/mouse/bcm5974.c
Diff comments   View file @ 8c89cc1
... ... @@ -89,9 +89,9 @@
89 89 #define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a
90 90 #define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b
91 91 /* MacbookAir6,2 (unibody, June 2013) */
92   -#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291
93   -#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292
94   -#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293
  92 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290
  93 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291
  94 +#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292
95 95  
96 96 #define BCM5974_DEVICE(prod) { \
97 97 .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \