| From 21404b772a1c65f7b935b8c0fddc388a949f4e31 Mon Sep 17 00:00:00 2001 |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| Date: Sun, 6 Nov 2011 18:34:03 -0800 |
| Subject: hid/apple: modern macbook airs use the standard apple function key translations |
| |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| |
| commit 21404b772a1c65f7b935b8c0fddc388a949f4e31 upstream. |
| |
| This removes the use of the special "macbookair_fn_keys" keyboard |
| translation table for the MacBookAir4,x models (ie the 2011 refresh). |
| They use the standard apple_fn_keys[] translation. Apparently only the |
| old MacBook Air's need a different translation table. |
| |
| This mirrors the change that commit da617c7cb915 ("HID: consolidate |
| MacbookAir 4,1 mappings") did for the WELLSPRING6A ones, but does it for |
| the WELLSPRING6 model used on the MacBookAir4,2. |
| |
| Reported-and-tested-by: Dirk Hohndel <hohndel@infradead.org> |
| Cc: Jiri Kosina <jkosina@suse.cz> |
| Cc: Joshua V Dillon <jvdillon@gmail.com> |
| Cc: Chase Douglas <chase.douglas@canonical.com> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- a/drivers/hid/hid-apple.c |
| +++ b/drivers/hid/hid-apple.c |
| @@ -183,9 +183,6 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, |
| if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && |
| hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) |
| table = macbookair_fn_keys; |
| - else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI && |
| - hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) |
| - table = macbookair_fn_keys; |
| else if (hid->product < 0x21d || hid->product >= 0x300) |
| table = powerbook_fn_keys; |
| else |
