Merge branch 'hid-suspend' into picolcd

3 files changed, 26 insertions, 1 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 3e7909b0f12..17eb3ec3fbb 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1291,6 +1291,11 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
                 {
                         set_bit(HID_REPORTED_IDLE, &usbhid->iofl);
                         spin_unlock_irq(&usbhid->lock);
+                        if (hid->driver && hid->driver->suspend) {
+                                status = hid->driver->suspend(hid, message);
+                                if (status < 0)
+                                        return status;
+                        }
                 } else {
                         usbhid_mark_busy(usbhid);
                         spin_unlock_irq(&usbhid->lock);
@@ -1298,6 +1303,11 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
                 }
 
         } else {
+                if (hid->driver && hid->driver->suspend) {
+                        status = hid->driver->suspend(hid, message);
+                        if (status < 0)
+                                return status;
+                }
                 spin_lock_irq(&usbhid->lock);
                 set_bit(HID_REPORTED_IDLE, &usbhid->iofl);
                 spin_unlock_irq(&usbhid->lock);
@@ -1352,6 +1362,11 @@ static int hid_resume(struct usb_interface *intf)
                 hid_io_error(hid);
         usbhid_restart_queues(usbhid);
 
+        if (status >= 0 && hid->driver && hid->driver->resume) {
+                int ret = hid->driver->resume(hid);
+                if (ret < 0)
+                        status = ret;
+        }
         dev_dbg(&intf->dev, "resume status %d\n", status);
         return 0;
 }
@@ -1360,9 +1375,16 @@ static int hid_reset_resume(struct usb_interface *intf)
 {
         struct hid_device *hid = usb_get_intfdata(intf);
         struct usbhid_device *usbhid = hid->driver_data;
+        int status;
 
         clear_bit(HID_REPORTED_IDLE, &usbhid->iofl);
-        return hid_post_reset(intf);
+        status = hid_post_reset(intf);
+        if (status >= 0 && hid->driver && hid->driver->reset_resume) {
+                int ret = hid->driver->reset_resume(hid);
+                if (ret < 0)
+                        status = ret;
+        }
+        return status;
 }
 
 #endif /* CONFIG_PM */
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c
index e565dbe91d9..ef381d79cfa 100644
--- a/drivers/hid/usbhid/hid-pidff.c
+++ b/drivers/hid/usbhid/hid-pidff.c
@@ -25,6 +25,7 @@
 #define debug(format, arg...) pr_debug("hid-pidff: " format "\n" , ## arg)
 
 #include <linux/input.h>
+#include <linux/slab.h>
 #include <linux/usb.h>
 
 #include <linux/hid.h>
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 928943c7ce9..1152f9b5fd4 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -16,6 +16,7 @@
  */
 
 #include <linux/hid.h>
+#include <linux/slab.h>
 
 #include "../hid-ids.h"
 
@@ -60,6 +61,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
+        { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET },
         { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT },