Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus

Conflicts:
	drivers/hid/Kconfig

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index ceaf4a14b67b..56d06cd8075b 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -798,7 +798,8 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid)
         return 0;
 }
 
-static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count)
+static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count,
+                unsigned char report_type)
 {
         struct usbhid_device *usbhid = hid->driver_data;
         struct usb_device *dev = hid_to_usb_dev(hid);
@@ -809,7 +810,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
         ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                 HID_REQ_SET_REPORT,
                 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                ((HID_OUTPUT_REPORT + 1) << 8) | *buf,
+                ((report_type + 1) << 8) | *buf,
                 interface->desc.bInterfaceNumber, buf + 1, count - 1,
                 USB_CTRL_SET_TIMEOUT);