From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762730AbZBNBQj (ORCPT ); Fri, 13 Feb 2009 20:16:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761628AbZBNBCL (ORCPT ); Fri, 13 Feb 2009 20:02:11 -0500 Received: from kroah.org ([198.145.64.141]:39937 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756089AbZBNBCD (ORCPT ); Fri, 13 Feb 2009 20:02:03 -0500 Date: Fri, 13 Feb 2009 16:59:24 -0800 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , Michael Krufky , Chuck Ebbert , Domenico Andreoli , Willy Tarreau , Rodrigo Rubira Branco , Jake Edge , Eugene Teo , torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Jiri Kosina , Jan Scholz , Torsten Rausche Subject: [patch 41/47] bluetooth hid: enable quirk handling for Apple Wireless Keyboards in 2.6.27 Message-ID: <20090214005924.GP11282@kroah.com> References: <20090214005130.617401075@mini.kroah.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="bluetooth-hid-enable-quirk-handling-for-apple-wireless-keyboards-in-2.6.27.patch" In-Reply-To: <20090214005726.GA11282@kroah.com> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.27-stable review patch. If anyone has any objections, please let us know. ------------------ From: Torsten Rausche 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 Cc: Jan Scholz Cc: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- --- 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 */ };