12 files changed, 225 insertions, 100 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index f5999a91614e..b4fd8ca701a4 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -247,7 +247,6 @@ config HID_SUNPLUS
 
 config THRUSTMASTER_FF
         tristate "ThrustMaster devices support"
-        default m
         depends on USB_HID
         select INPUT_FF_MEMLESS
         help
@@ -256,7 +255,6 @@ config THRUSTMASTER_FF
 
 config ZEROPLUS_FF
         tristate "Zeroplus based game controller support"
-        default m
         depends on USB_HID
         select INPUT_FF_MEMLESS
         help
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index fd7f896b34f7..9b97795e45ad 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -55,10 +55,11 @@ struct apple_key_translation {
 
 static struct apple_key_translation apple_fn_keys[] = {
         { KEY_BACKSPACE, KEY_DELETE },
+        { KEY_ENTER,    KEY_INSERT },
         { KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
         { KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },
-        { KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */
-        { KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */
+        { KEY_F3,       KEY_SCALE,          APPLE_FLAG_FKEY },
+        { KEY_F4,       KEY_DASHBOARD,      APPLE_FLAG_FKEY },
         { KEY_F5,       KEY_KBDILLUMDOWN,   APPLE_FLAG_FKEY },
         { KEY_F6,       KEY_KBDILLUMUP,     APPLE_FLAG_FKEY },
         { KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
@@ -312,13 +313,6 @@ static int apple_probe(struct hid_device *hdev,
         unsigned int connect_mask = HID_CONNECT_DEFAULT;
         int ret;
 
-        /* return something else or move to hid layer? device will reside
-           allocated */
-        if (id->bus == BUS_USB && (quirks & APPLE_IGNORE_MOUSE) &&
-                        to_usb_interface(hdev->dev.parent)->cur_altsetting->
-                        desc.bInterfaceProtocol == USB_INTERFACE_PROTOCOL_MOUSE)
-                return -ENODEV;
-
         asc = kzalloc(sizeof(*asc), GFP_KERNEL);
         if (asc == NULL) {
                 dev_err(&hdev->dev, "can't alloc apple descriptor\n");
@@ -367,38 +361,32 @@ static const struct hid_device_id apple_devices[] = {
                 .driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
 
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+                        APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+                        APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                        APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_ISO_KEYBOARD },
+                        APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS},
+                        APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI),
                 .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO),
@@ -406,14 +394,12 @@ static const struct hid_device_id apple_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS),
                 .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                        APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO),
@@ -422,25 +408,27 @@ static const struct hid_device_id apple_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO),
-                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO),
-                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS),
-                .driver_data = APPLE_HAS_FN | APPLE_IGNORE_MOUSE | APPLE_RDESC_JIS },
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
+                .driver_data = APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY),
-                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN |
-                        APPLE_IGNORE_MOUSE },
+                .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
 
         /* Apple wireless Mighty Mouse */
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c),
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 721a36d97582..147ec591a806 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1250,9 +1250,11 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_ABNT2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION) },
@@ -1263,7 +1265,9 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
         { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) },
@@ -1275,8 +1279,6 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3) },
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_RUMBLEPAD) },
@@ -1295,6 +1297,7 @@ static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
         { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
 
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, 0x030c) },
@@ -1406,6 +1409,8 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232) },
         { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM)},
+        { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_LCM2)},
+        { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
         { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
         { HID_USB_DEVICE(USB_VENDOR_ID_CYGNAL, USB_DEVICE_ID_CYGNAL_RADIO_SI470X) },
@@ -1483,6 +1488,7 @@ static const struct hid_device_id hid_ignore_list[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1007) },
         { HID_USB_DEVICE(USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA) },
         { HID_USB_DEVICE(USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },
         { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY) },
         { HID_USB_DEVICE(USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY) },
@@ -1541,6 +1547,43 @@ static const struct hid_device_id hid_ignore_list[] = {
         { }
 };
 
+/**
+ * hid_mouse_ignore_list - mouse devices which should not be handled by the hid layer
+ *
+ * There are composite devices for which we want to ignore only a certain
+ * interface. This is a list of devices for which only the mouse interface will
+ * be ignored. This allows a dedicated driver to take care of the interface.
+ */
+static const struct hid_device_id hid_mouse_ignore_list[] = {
+        /* appletouch driver */
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING2_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
+        { }
+};
+
 static bool hid_ignore(struct hid_device *hdev)
 {
         switch (hdev->vendor) {
@@ -1557,6 +1600,10 @@ static bool hid_ignore(struct hid_device *hdev)
                 break;
         }
 
+        if (hdev->type == HID_TYPE_USBMOUSE &&
+                        hid_match_id(hdev, hid_mouse_ignore_list))
+                return true;
+
         return !!hid_match_id(hdev, hid_ignore_list);
 }
 
@@ -1689,7 +1736,7 @@ static int __init hid_init(void)
                 goto err_bus;
 
 #ifdef CONFIG_HID_COMPAT
-        hid_compat_wq = create_workqueue("hid_compat");
+        hid_compat_wq = create_singlethread_workqueue("hid_compat");
         if (!hid_compat_wq) {
                 hidraw_exit();
                 goto err;
diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c
index 1a0d0dfc62fc..f5474300b83a 100644
--- a/drivers/hid/hid-dell.c
+++ b/drivers/hid/hid-dell.c
@@ -48,6 +48,7 @@ err_free:
 static const struct hid_device_id dell_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
         { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
         { }
 };
 MODULE_DEVICE_TABLE(hid, dell_devices);
diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c
index ac5120f542cc..04a0afec52ac 100644
--- a/drivers/hid/hid-gyration.c
+++ b/drivers/hid/hid-gyration.c
@@ -4,9 +4,9 @@
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
- *  Copyright (c) 2006-2007 Jiri Kosina
  *  Copyright (c) 2007 Paul Walmsley
  *  Copyright (c) 2008 Jiri Slaby
+ *  Copyright (c) 2006-2008 Jiri Kosina
  */
 
 /*
@@ -40,6 +40,7 @@ static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi,
         case 0x025: gy_map_key_clear(KEY_PVR);          break;
         case 0x046: gy_map_key_clear(KEY_MEDIA);        break;
         case 0x047: gy_map_key_clear(KEY_MP3);          break;
+        case 0x048: gy_map_key_clear(KEY_MEDIA);        break;
         case 0x049: gy_map_key_clear(KEY_CAMERA);       break;
         case 0x04a: gy_map_key_clear(KEY_VIDEO);        break;
 
@@ -68,6 +69,7 @@ static int gyration_event(struct hid_device *hdev, struct hid_field *field,
 
 static const struct hid_device_id gyration_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
         { }
 };
 MODULE_DEVICE_TABLE(hid, gyration_devices);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index d9a1ba920c23..d70075dd3d81 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -82,6 +82,9 @@
 #define USB_DEVICE_ID_APPLE_WELLSPRING2_ANSI    0x0230
 #define USB_DEVICE_ID_APPLE_WELLSPRING2_ISO     0x0231
 #define USB_DEVICE_ID_APPLE_WELLSPRING2_JIS     0x0232
+#define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI    0x0236
+#define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO     0x0237
+#define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS     0x0238
 #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
 #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
 #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL       0x8241
@@ -89,6 +92,7 @@
 
 #define USB_VENDOR_ID_ASUS              0x0b05
 #define USB_DEVICE_ID_ASUS_LCM          0x1726
+#define USB_DEVICE_ID_ASUS_LCM2         0x175b
 
 #define USB_VENDOR_ID_ATEN              0x0557
 #define USB_DEVICE_ID_ATEN_UC100KM      0x2004
@@ -162,6 +166,9 @@
 
 #define USB_VENDOR_ID_GENERAL_TOUCH     0x0dfc
 
+#define USB_VENDOR_ID_GENERIC_13BA      0x13ba
+#define USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE    0x0017
+
 #define USB_VENDOR_ID_GLAB              0x06c2
 #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
 #define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
@@ -236,6 +243,7 @@
 
 #define USB_VENDOR_ID_GYRATION          0x0c16
 #define USB_DEVICE_ID_GYRATION_REMOTE   0x0002
+#define USB_DEVICE_ID_GYRATION_REMOTE_2 0x0003
 
 #define USB_VENDOR_ID_HAPP              0x078b
 #define USB_DEVICE_ID_UGCI_DRIVING      0x0010
@@ -248,6 +256,9 @@
 #define USB_VENDOR_ID_KBGEAR            0x084e
 #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO  0x1001
 
+#define USB_VENDOR_ID_KWORLD            0x1b80
+#define USB_DEVICE_ID_KWORLD_RADIO_FM700        0xd700
+
 #define USB_VENDOR_ID_LABTEC            0x1020
 #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD  0x0006
 
@@ -268,8 +279,6 @@
 #define USB_DEVICE_ID_LD_MACHINETEST    0x2040
 
 #define USB_VENDOR_ID_LOGITECH          0x046d
-#define USB_DEVICE_ID_LOGITECH_LX3      0xc044
-#define USB_DEVICE_ID_LOGITECH_V150     0xc047
 #define USB_DEVICE_ID_LOGITECH_RECEIVER 0xc101
 #define USB_DEVICE_ID_LOGITECH_HARMONY_FIRST  0xc110
 #define USB_DEVICE_ID_LOGITECH_HARMONY_LAST 0xc14f
@@ -350,6 +359,7 @@
 #define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
 
 #define USB_VENDOR_ID_SONY                      0x054c
+#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE       0x024b
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER       0x0268
 
 #define USB_VENDOR_ID_SOUNDGRAPH        0x15c2
diff --git a/drivers/hid/hid-lg.c b/drivers/hid/hid-lg.c
index 406d8c82abf1..2bae340eafe2 100644
--- a/drivers/hid/hid-lg.c
+++ b/drivers/hid/hid-lg.c
@@ -287,11 +287,6 @@ static const struct hid_device_id lg_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500),
                 .driver_data = LG_IGNORE_DOUBLED_WHEEL | LG_EXPANDED_KEYMAP },
 
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_LX3),
-                .driver_data = LG_INVERT_HWHEEL },
-        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_V150),
-                .driver_data = LG_INVERT_HWHEEL },
-
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_EXTREME_3D),
                 .driver_data = LG_NOGET },
         { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_WHEEL),
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 3af8095a7de1..86e563b8d644 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -4,9 +4,9 @@
  *  Copyright (c) 1999 Andreas Gal
  *  Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
  *  Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
- *  Copyright (c) 2006-2007 Jiri Kosina
  *  Copyright (c) 2007 Paul Walmsley
  *  Copyright (c) 2008 Jiri Slaby
+ *  Copyright (c) 2006-2008 Jiri Kosina
  */
 
 /*
@@ -23,6 +23,26 @@
 
 #include "hid-ids.h"
 
+#define VAIO_RDESC_CONSTANT 0x0001
+
+struct sony_sc {
+        unsigned long quirks;
+};
+
+/* Sony Vaio VGX has wrongly mouse pointer declared as constant */
+static void sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
+                unsigned int rsize)
+{
+        struct sony_sc *sc = hid_get_drvdata(hdev);
+
+        if ((sc->quirks & VAIO_RDESC_CONSTANT) &&
+                        rsize >= 56 && rdesc[54] == 0x81 && rdesc[55] == 0x07) {
+                dev_info(&hdev->dev, "Fixing up Sony Vaio VGX report "
+                                "descriptor\n");
+                rdesc[55] = 0x06;
+        }
+}
+
 /*
  * Sending HID_REQ_GET_REPORT changes the operation mode of the ps3 controller
  * to "operational".  Without this, the ps3 controller will not report any
@@ -56,6 +76,17 @@ static int sony_set_operational(struct hid_device *hdev)
 static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
         int ret;
+        unsigned long quirks = id->driver_data;
+        struct sony_sc *sc;
+
+        sc = kzalloc(sizeof(*sc), GFP_KERNEL);
+        if (sc == NULL) {
+                dev_err(&hdev->dev, "can't alloc apple descriptor\n");
+                return -ENOMEM;
+        }
+
+        sc->quirks = quirks;
+        hid_set_drvdata(hdev, sc);
 
         ret = hid_parse(hdev);
         if (ret) {
@@ -78,11 +109,20 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
 err_stop:
         hid_hw_stop(hdev);
 err_free:
+        kfree(sc);
         return ret;
 }
 
+static void sony_remove(struct hid_device *hdev)
+{
+        hid_hw_stop(hdev);
+        kfree(hid_get_drvdata(hdev));
+}
+
 static const struct hid_device_id sony_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE),
+                .driver_data = VAIO_RDESC_CONSTANT },
         { }
 };
 MODULE_DEVICE_TABLE(hid, sony_devices);
@@ -91,6 +131,8 @@ static struct hid_driver sony_driver = {
         .name = "sony",
         .id_table = sony_devices,
         .probe = sony_probe,
+        .remove = sony_remove,
+        .report_fixup = sony_report_fixup,
 };
 
 static int sony_init(void)
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index af3edb98df43..7685ae6808c4 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -38,7 +38,7 @@ static int hidraw_major;
 static struct cdev hidraw_cdev;
 static struct class *hidraw_class;
 static struct hidraw *hidraw_table[HIDRAW_MAX_DEVICES];
-static DEFINE_SPINLOCK(minors_lock);
+static DEFINE_MUTEX(minors_lock);
 
 static ssize_t hidraw_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
@@ -159,13 +159,13 @@ static int hidraw_open(struct inode *inode, struct file *file)
         struct hidraw_list *list;
         int err = 0;
 
-        lock_kernel();
         if (!(list = kzalloc(sizeof(struct hidraw_list), GFP_KERNEL))) {
                 err = -ENOMEM;
                 goto out;
         }
 
-        spin_lock(&minors_lock);
+        lock_kernel();
+        mutex_lock(&minors_lock);
         if (!hidraw_table[minor]) {
                 printk(KERN_EMERG "hidraw device with minor %d doesn't exist\n",
                                 minor);
@@ -180,13 +180,16 @@ static int hidraw_open(struct inode *inode, struct file *file)
         file->private_data = list;
 
         dev = hidraw_table[minor];
-        if (!dev->open++)
-                dev->hid->ll_driver->open(dev->hid);
+        if (!dev->open++) {
+                err = dev->hid->ll_driver->open(dev->hid);
+                if (err < 0)
+                        dev->open--;
+        }
 
 out_unlock:
-        spin_unlock(&minors_lock);
-out:
+        mutex_unlock(&minors_lock);
         unlock_kernel();
+out:
         return err;
 
 }
@@ -264,6 +267,7 @@ static long hidraw_ioctl(struct file *file, unsigned int cmd,
                 default:
                         ret = -ENOTTY;
         }
+        unlock_kernel();
         return ret;
 }
 
@@ -309,7 +313,7 @@ int hidraw_connect(struct hid_device *hid)
 
         result = -EINVAL;
 
-        spin_lock(&minors_lock);
+        mutex_lock(&minors_lock);
 
         for (minor = 0; minor < HIDRAW_MAX_DEVICES; minor++) {
                 if (hidraw_table[minor])
@@ -319,9 +323,8 @@ int hidraw_connect(struct hid_device *hid)
                 break;
         }
 
-        spin_unlock(&minors_lock);
-
         if (result) {
+                mutex_unlock(&minors_lock);
                 kfree(dev);
                 goto out;
         }
@@ -330,14 +333,14 @@ int hidraw_connect(struct hid_device *hid)
                                  NULL, "%s%d", "hidraw", minor);
 
         if (IS_ERR(dev->dev)) {
-                spin_lock(&minors_lock);
                 hidraw_table[minor] = NULL;
-                spin_unlock(&minors_lock);
+                mutex_unlock(&minors_lock);
                 result = PTR_ERR(dev->dev);
                 kfree(dev);
                 goto out;
         }
 
+        mutex_unlock(&minors_lock);
         init_waitqueue_head(&dev->wait);
         INIT_LIST_HEAD(&dev->list);
 
@@ -359,9 +362,9 @@ void hidraw_disconnect(struct hid_device *hid)
 
         hidraw->exist = 0;
 
-        spin_lock(&minors_lock);
+        mutex_lock(&minors_lock);
         hidraw_table[hidraw->minor] = NULL;
-        spin_unlock(&minors_lock);
+        mutex_unlock(&minors_lock);
 
         device_destroy(hidraw_class, MKDEV(hidraw_major, hidraw->minor));
 
@@ -403,7 +406,7 @@ out:
         return result;
 }
 
-void __exit hidraw_exit(void)
+void hidraw_exit(void)
 {
         dev_t dev_id = MKDEV(hidraw_major, 0);
 
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 705a43cdeea4..d746bf8284dd 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mm.h>
+#include <linux/mutex.h>
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <asm/unaligned.h>
@@ -776,20 +777,11 @@ static int usbhid_start(struct hid_device *hid)
         struct usb_interface *intf = to_usb_interface(hid->dev.parent);
         struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_device *dev = interface_to_usbdev(intf);
-        struct usbhid_device *usbhid;
+        struct usbhid_device *usbhid = hid->driver_data;
         unsigned int n, insize = 0;
         int ret;
 
-        WARN_ON(hid->driver_data);
-
-        usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL);
-        if (usbhid == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-
-        hid->driver_data = usbhid;
-        usbhid->hid = hid;
+        clear_bit(HID_DISCONNECTED, &usbhid->iofl);
 
         usbhid->bufsize = HID_MIN_BUFFER_SIZE;
         hid_find_max_report(hid, HID_INPUT_REPORT, &usbhid->bufsize);
@@ -804,6 +796,7 @@ static int usbhid_start(struct hid_device *hid)
         if (insize > HID_MAX_BUFFER_SIZE)
                 insize = HID_MAX_BUFFER_SIZE;
 
+        mutex_lock(&usbhid->setup);
         if (hid_alloc_buffers(dev, hid)) {
                 ret = -ENOMEM;
                 goto fail;
@@ -856,12 +849,6 @@ static int usbhid_start(struct hid_device *hid)
                 }
         }
 
-        if (!usbhid->urbin) {
-                err_hid("couldn't find an input interrupt endpoint");
-                ret = -ENODEV;
-                goto fail;
-        }
-
         init_waitqueue_head(&usbhid->wait);
         INIT_WORK(&usbhid->reset_work, hid_reset);
         setup_timer(&usbhid->io_retry, hid_retry_timeout, (unsigned long) hid);
@@ -888,15 +875,20 @@ static int usbhid_start(struct hid_device *hid)
         usbhid_init_reports(hid);
         hid_dump_device(hid);
 
+        set_bit(HID_STARTED, &usbhid->iofl);
+        mutex_unlock(&usbhid->setup);
+
         return 0;
 
 fail:
         usb_free_urb(usbhid->urbin);
         usb_free_urb(usbhid->urbout);
         usb_free_urb(usbhid->urbctrl);
+        usbhid->urbin = NULL;
+        usbhid->urbout = NULL;
+        usbhid->urbctrl = NULL;
         hid_free_buffers(dev, hid);
-        kfree(usbhid);
-err:
+        mutex_unlock(&usbhid->setup);
         return ret;
 }
 
@@ -907,6 +899,8 @@ static void usbhid_stop(struct hid_device *hid)
         if (WARN_ON(!usbhid))
                 return;
 
+        mutex_lock(&usbhid->setup);
+        clear_bit(HID_STARTED, &usbhid->iofl);
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_DISCONNECTED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
@@ -929,10 +923,12 @@ static void usbhid_stop(struct hid_device *hid)
         usb_free_urb(usbhid->urbin);
         usb_free_urb(usbhid->urbctrl);
         usb_free_urb(usbhid->urbout);
+        usbhid->urbin = NULL; /* don't mess up next start */
+        usbhid->urbctrl = NULL;
+        usbhid->urbout = NULL;
 
         hid_free_buffers(hid_to_usb_dev(hid), hid);
-        kfree(usbhid);
-        hid->driver_data = NULL;
+        mutex_unlock(&usbhid->setup);
 }
 
 static struct hid_ll_driver usb_hid_driver = {
@@ -946,14 +942,26 @@ static struct hid_ll_driver usb_hid_driver = {
 
 static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
+        struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_device *dev = interface_to_usbdev(intf);
+        struct usbhid_device *usbhid;
         struct hid_device *hid;
+        unsigned int n, has_in = 0;
         size_t len;
         int ret;
 
         dbg_hid("HID probe called for ifnum %d\n",
                         intf->altsetting->desc.bInterfaceNumber);
 
+        for (n = 0; n < interface->desc.bNumEndpoints; n++)
+                if (usb_endpoint_is_int_in(&interface->endpoint[n].desc))
+                        has_in++;
+        if (!has_in) {
+                dev_err(&intf->dev, "couldn't find an input interrupt "
+                                "endpoint\n");
+                return -ENODEV;
+        }
+
         hid = hid_allocate_device();
         if (IS_ERR(hid))
                 return PTR_ERR(hid);
@@ -972,6 +980,9 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         hid->vendor = le16_to_cpu(dev->descriptor.idVendor);
         hid->product = le16_to_cpu(dev->descriptor.idProduct);
         hid->name[0] = 0;
+        if (intf->cur_altsetting->desc.bInterfaceProtocol ==
+                        USB_INTERFACE_PROTOCOL_MOUSE)
+                hid->type = HID_TYPE_USBMOUSE;
 
         if (dev->manufacturer)
                 strlcpy(hid->name, dev->manufacturer, sizeof(hid->name));
@@ -997,14 +1008,26 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         if (usb_string(dev, dev->descriptor.iSerialNumber, hid->uniq, 64) <= 0)
                 hid->uniq[0] = 0;
 
+        usbhid = kzalloc(sizeof(*usbhid), GFP_KERNEL);
+        if (usbhid == NULL) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        hid->driver_data = usbhid;
+        usbhid->hid = hid;
+        mutex_init(&usbhid->setup); /* needed on suspend/resume */
+
         ret = hid_add_device(hid);
         if (ret) {
                 if (ret != -ENODEV)
                         dev_err(&intf->dev, "can't add hid device: %d\n", ret);
-                goto err;
+                goto err_free;
         }
 
         return 0;
+err_free:
+        kfree(usbhid);
 err:
         hid_destroy_device(hid);
         return ret;
@@ -1013,11 +1036,14 @@ err:
 static void hid_disconnect(struct usb_interface *intf)
 {
         struct hid_device *hid = usb_get_intfdata(intf);
+        struct usbhid_device *usbhid;
 
         if (WARN_ON(!hid))
                 return;
 
+        usbhid = hid->driver_data;
         hid_destroy_device(hid);
+        kfree(usbhid);
 }
 
 static int hid_suspend(struct usb_interface *intf, pm_message_t message)
@@ -1025,11 +1051,18 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
         struct hid_device *hid = usb_get_intfdata (intf);
         struct usbhid_device *usbhid = hid->driver_data;
 
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
+
         spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
         set_bit(HID_SUSPENDED, &usbhid->iofl);
         spin_unlock_irq(&usbhid->inlock);
-        del_timer(&usbhid->io_retry);
+        del_timer_sync(&usbhid->io_retry);
         usb_kill_urb(usbhid->urbin);
+        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "suspend\n");
         return 0;
 }
@@ -1040,9 +1073,16 @@ static int hid_resume(struct usb_interface *intf)
         struct usbhid_device *usbhid = hid->driver_data;
         int status;
 
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
+
         clear_bit(HID_SUSPENDED, &usbhid->iofl);
         usbhid->retry_delay = 0;
         status = hid_start_in(hid);
+        mutex_unlock(&usbhid->setup);
         dev_dbg(&intf->dev, "resume status %d\n", status);
         return status;
 }
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index babd65dd46ad..83e851a5ed30 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -242,8 +242,6 @@ static int hiddev_release(struct inode * inode, struct file * file)
         struct hiddev_list *list = file->private_data;
         unsigned long flags;
 
-        hiddev_fasync(-1, file, 0);
-
         spin_lock_irqsave(&list->hiddev->list_lock, flags);
         list_del(&list->node);
         spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
@@ -436,8 +434,7 @@ static noinline int hiddev_ioctl_usage(struct hiddev *hiddev, unsigned int cmd,
                 if (copy_to_user(user_arg, uref, sizeof(*uref)))
                         goto fault;
 
-                kfree(uref_multi);
-                return 0;
+                goto goodreturn;
 
         default:
                 if (cmd != HIDIOCGUSAGE &&
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index abedb13c623e..55973ff54008 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
@@ -73,6 +74,7 @@ struct usbhid_device {
         dma_addr_t outbuf_dma;                                          /* Output buffer dma */
         spinlock_t outlock;                                             /* Output fifo spinlock */
 
+        struct mutex setup;
         unsigned long iofl;                                             /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
         struct timer_list io_retry;                                     /* Retry timer */
         unsigned long stop_retry;                                       /* Time to give up, in jiffies */