| From torsten@rausche.net Fri Feb 13 15:29:02 2009 |
| From: Torsten Rausche <torsten@rausche.net> |
| Date: Thu, 12 Feb 2009 02:32:44 +0100 |
| Subject: bluetooth hid: enable quirk handling for Apple Wireless Keyboards in 2.6.27 |
| To: stable@kernel.org |
| Cc: Jiri Kosina <jkosina@suse.cz>, Jan Scholz <Scholz@fias.uni-frankfurt.de> |
| Message-ID: <1234402364.16307.238.camel@localhost.localdomain> |
| |
| From: Torsten Rausche <torsten@rausche.net> |
| |
| This patch is basically a backport of |
| commit ee8a1a0a1a5817accd03ced7e7ffde3a4430f485 upstream |
| which was made after the big HID overhaul in 2.6.28. |
| |
| Kernel 2.6.27 fails to handle quirks for the aluminum Apple Wireless |
| Keyboard because it is handled as USB device and not as Bluetooth |
| device. This patch expands 'hidp_blacklist' to make the kernel handle |
| the keyboard in the same way as the Apple wireless Mighty Mouse (also a |
| Bluetooth device). |
| |
| Signed-off-by: Torsten Rausche <torsten@rausche.net> |
| Cc: Jan Scholz <Scholz@fias.uni-frankfurt.de> |
| Cc: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| --- |
| net/bluetooth/hidp/core.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/net/bluetooth/hidp/core.c |
| +++ b/net/bluetooth/hidp/core.c |
| @@ -684,6 +684,10 @@ static const struct { |
| } hidp_blacklist[] = { |
| /* Apple wireless Mighty Mouse */ |
| { 0x05ac, 0x030c, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, |
| + /* Apple Wireless Keyboard */ |
| + { 0x05ac, 0x022c, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, |
| + { 0x05ac, 0x022d, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD }, |
| + { 0x05ac, 0x022e, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN }, |
| |
| { } /* Terminating entry */ |
| }; |