[PATCH] [Karmic] HID: completely remove apple mightymouse from blacklist

[Leann Ogasawara]

Hi All,

Upstream commit fa047e4f6fa63a6e9d0ae4d7749538830d14a343 was intended to
fix an inverted horizontal scroll for the bluetooth version of Apple
Mighty Mouse, however, it was incomplete.  If Apple Mighty Mouse
(bluetooth version) is removed from the list of apple_devices in
drivers/hid/hid-apple.c it must also be removed from the hid_blacklist
in drivers/hid/hid-core.c as well.  The following cherry-pick from
upstream (42960a13001aa6df52ca9952ce996f94a744ea65) completes the fix by
removing the apple mighty mouse from the hid_blacklist.  This was
reported via Launchpad bug 428111 and will prevent a regression from
Jaunty.  This patch was tested by the original bug reporter and has been
confirmed to fix the issue.  Please consider carrying for Karmic.

Thanks,
Leann

The following changes since commit 75c05d736ae66c8c726f7e8cd5cadf6737798060:
  Tim Gardner (1):
        UBUNTU: Ubuntu-2.6.31-11.36

are available in the git repository at:

  git://kernel.ubuntu.com/ogasawara/ubuntu-karmic.git lp428111

Jan Scholz (1):
      HID: completely remove apple mightymouse from blacklist

 drivers/hid/hid-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

>From 9d5f41acc0973c4019175e27b33472c35977dc35 Mon Sep 17 00:00:00 2001
From: Jan Scholz <Scholz at fias.uni-frankfurt.de>
Date: Wed, 26 Aug 2009 13:18:51 +0200
Subject: [PATCH] HID: completely remove apple mightymouse from blacklist

Commit fa047e4f6fa63a6e9d0ae4d7749538830d14a343 "HID: fix inverted
wheel for bluetooth version of apple mighty mouse" is incomplete. If
we remove Apple MightyMouse (bluetooth version) from the list of
apple_devices in drivers/hid/hid-apple.c we have to remove it from
hid_blacklist in drivers/hid/hid-core.c as well.

Signed-off-by: Jan Scholz <Scholz at fias.uni-frankfurt.de>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
(cherry picked from commit 42960a13001aa6df52ca9952ce996f94a744ea65)

Signed-off-by: Leann Ogasawara <leann.ogasawara at canonical.com>
---
 drivers/hid/hid-core.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 5eb10c2..047844d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1319,7 +1319,6 @@ static const struct hid_device_id hid_blacklist[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0005) },
 	{ HID_USB_DEVICE(USB_VENDOR_ID_ZEROPLUS, 0x0030) },
 
-	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT) },
 	{ }
 };
-- 
1.6.3.3