Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-wacom.c

3 files changed, 38 insertions, 12 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 7b85b696fdab..a2ebe1996740 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -807,16 +807,36 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
         struct usb_host_interface *interface = intf->cur_altsetting;
         int ret;
 
-        ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
-                HID_REQ_SET_REPORT,
-                USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                ((report_type + 1) << 8) | *buf,
-                interface->desc.bInterfaceNumber, buf + 1, count - 1,
-                USB_CTRL_SET_TIMEOUT);
-
-        /* count also the report id */
-        if (ret > 0)
-                ret++;
+        if (usbhid->urbout) {
+                int actual_length;
+                int skipped_report_id = 0;
+                if (buf[0] == 0x0) {
+                        /* Don't send the Report ID */
+                        buf++;
+                        count--;
+                        skipped_report_id = 1;
+                }
+                ret = usb_interrupt_msg(dev, usbhid->urbout->pipe,
+                        buf, count, &actual_length,
+                        USB_CTRL_SET_TIMEOUT);
+                /* return the number of bytes transferred */
+                if (ret == 0) {
+                        ret = actual_length;
+                        /* count also the report id */
+                        if (skipped_report_id)
+                                ret++;
+                }
+        } else {
+                ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+                        HID_REQ_SET_REPORT,
+                        USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
+                        ((report_type + 1) << 8) | *buf,
+                        interface->desc.bInterfaceNumber, buf + 1, count - 1,
+                        USB_CTRL_SET_TIMEOUT);
+                /* count also the report id */
+                if (ret > 0)
+                        ret++;
+        }
 
         return ret;
 }
@@ -1019,12 +1039,15 @@ static int usbhid_start(struct hid_device *hid)
         /* Some keyboards don't work until their LEDs have been set.
          * Since BIOSes do set the LEDs, it must be safe for any device
          * that supports the keyboard boot protocol.
+         * In addition, enable remote wakeup by default for all keyboard
+         * devices supporting the boot protocol.
          */
         if (interface->desc.bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT &&
                         interface->desc.bInterfaceProtocol ==
-                                USB_INTERFACE_PROTOCOL_KEYBOARD)
+                                USB_INTERFACE_PROTOCOL_KEYBOARD) {
                 usbhid_set_leds(hid);
-
+                device_set_wakeup_enable(&dev->dev, 1);
+        }
         return 0;
 
 fail:
@@ -1133,6 +1156,7 @@ static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *
         hid->vendor = le16_to_cpu(dev->descriptor.idVendor);
         hid->product = le16_to_cpu(dev->descriptor.idProduct);
         hid->name[0] = 0;
+        hid->quirks = usbhid_lookup_quirk(hid->vendor, hid->product);
         if (intf->cur_altsetting->desc.bInterfaceProtocol ==
                         USB_INTERFACE_PROTOCOL_MOUSE)
                 hid->type = HID_TYPE_USBMOUSE;
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 1152f9b5fd44..7a6bda23283e 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -33,6 +33,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_AASHIMA, USB_DEVICE_ID_AASHIMA_PREDATOR, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_ALPS, USB_DEVICE_ID_IBM_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_CHIC, USB_DEVICE_ID_CHIC_GAMEPAD, HID_QUIRK_BADPAD },
+        { USB_VENDOR_ID_EGALAX, USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER, HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index f843443ba5c3..b2fd0b00de92 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -313,6 +313,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
                 goto fail2;
 
         usb_set_intfdata(iface, kbd);
+        device_set_wakeup_enable(&dev->dev, 1);
         return 0;
 
 fail2: