Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: Remove duplicate Kconfig entry
  HID: consolidate connect and disconnect into core code
  HID: fix non-atomic allocation in hid_input_report

3 files changed, 17 insertions, 20 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 111afbe8de03..24d90ea246ce 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -205,13 +205,6 @@ config HID_NTRIG
         Support for N-Trig touch screen.
 
 config HID_PANTHERLORD
-        tristate "Pantherlord devices support" if EMBEDDED
-        depends on USB_HID
-        default !EMBEDDED
-        ---help---
-        Support for PantherLord/GreenAsia based device support.
-
-config HID_PANTHERLORD
         tristate "Pantherlord support" if EMBEDDED
         depends on USB_HID
         default !EMBEDDED
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 342b7d36d7bb..be34d32906bd 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1089,8 +1089,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
                 return -1;
         }
 
-        buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE,
-                        interrupt ? GFP_ATOMIC : GFP_KERNEL);
+        buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE, GFP_ATOMIC);
 
         if (!buf) {
                 report = hid_get_report(report_enum, data);
@@ -1238,6 +1237,17 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
 }
 EXPORT_SYMBOL_GPL(hid_connect);
 
+void hid_disconnect(struct hid_device *hdev)
+{
+        if (hdev->claimed & HID_CLAIMED_INPUT)
+                hidinput_disconnect(hdev);
+        if (hdev->claimed & HID_CLAIMED_HIDDEV)
+                hdev->hiddev_disconnect(hdev);
+        if (hdev->claimed & HID_CLAIMED_HIDRAW)
+                hidraw_disconnect(hdev);
+}
+EXPORT_SYMBOL_GPL(hid_disconnect);
+
 /* a list of devices for which there is a specialized driver on HID bus */
 static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 1b0e07a67d6d..03bd703255a3 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1041,13 +1041,6 @@ static void usbhid_stop(struct hid_device *hid)
 
         hid_cancel_delayed_stuff(usbhid);
 
-        if (hid->claimed & HID_CLAIMED_INPUT)
-                hidinput_disconnect(hid);
-        if (hid->claimed & HID_CLAIMED_HIDDEV)
-                hiddev_disconnect(hid);
-        if (hid->claimed & HID_CLAIMED_HIDRAW)
-                hidraw_disconnect(hid);
-
         hid->claimed = 0;
 
         usb_free_urb(usbhid->urbin);
@@ -1085,7 +1078,7 @@ static struct hid_ll_driver usb_hid_driver = {
         .hidinput_input_event = usb_hidinput_input_event,
 };
 
-static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
+static int usbhid_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);
@@ -1117,6 +1110,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         hid->ff_init = hid_pidff_init;
 #ifdef CONFIG_USB_HIDDEV
         hid->hiddev_connect = hiddev_connect;
+        hid->hiddev_disconnect = hiddev_disconnect;
         hid->hiddev_hid_event = hiddev_hid_event;
         hid->hiddev_report_event = hiddev_report_event;
 #endif
@@ -1177,7 +1171,7 @@ err:
         return ret;
 }
 
-static void hid_disconnect(struct usb_interface *intf)
+static void usbhid_disconnect(struct usb_interface *intf)
 {
         struct hid_device *hid = usb_get_intfdata(intf);
         struct usbhid_device *usbhid;
@@ -1359,8 +1353,8 @@ MODULE_DEVICE_TABLE (usb, hid_usb_ids);
 
 static struct usb_driver hid_driver = {
         .name =         "usbhid",
-        .probe =        hid_probe,
-        .disconnect =   hid_disconnect,
+        .probe =        usbhid_probe,
+        .disconnect =   usbhid_disconnect,
 #ifdef CONFIG_PM
         .suspend =      hid_suspend,
         .resume =       hid_resume,