2 files changed, 31 insertions, 1 deletions

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index 19511481a7d3..f6ec5eaf6b89 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -92,8 +92,27 @@ static int uhid_queue_event(struct uhid_device *uhid, __u32 event)
 static int uhid_hid_start(struct hid_device *hid)
 {
         struct uhid_device *uhid = hid->driver_data;
+        struct uhid_event *ev;
+        unsigned long flags;
+
+        ev = kzalloc(sizeof(*ev), GFP_KERNEL);
+        if (!ev)
+                return -ENOMEM;
+
+        ev->type = UHID_START;
 
-        return uhid_queue_event(uhid, UHID_START);
+        if (hid->report_enum[HID_FEATURE_REPORT].numbered)
+                ev->u.start.dev_flags |= UHID_DEV_NUMBERED_FEATURE_REPORTS;
+        if (hid->report_enum[HID_OUTPUT_REPORT].numbered)
+                ev->u.start.dev_flags |= UHID_DEV_NUMBERED_OUTPUT_REPORTS;
+        if (hid->report_enum[HID_INPUT_REPORT].numbered)
+                ev->u.start.dev_flags |= UHID_DEV_NUMBERED_INPUT_REPORTS;
+
+        spin_lock_irqsave(&uhid->qlock, flags);
+        uhid_queue(uhid, ev);
+        spin_unlock_irqrestore(&uhid->qlock, flags);
+
+        return 0;
 }
 
 static void uhid_hid_stop(struct hid_device *hid)
diff --git a/include/uapi/linux/uhid.h b/include/uapi/linux/uhid.h
index 62aac0e4edf3..aaa86d6bd1dd 100644
--- a/include/uapi/linux/uhid.h
+++ b/include/uapi/linux/uhid.h
@@ -54,6 +54,16 @@ struct uhid_create2_req {
         __u8 rd_data[HID_MAX_DESCRIPTOR_SIZE];
 } __attribute__((__packed__));
 
+enum uhid_dev_flag {
+        UHID_DEV_NUMBERED_FEATURE_REPORTS                       = (1ULL << 0),
+        UHID_DEV_NUMBERED_OUTPUT_REPORTS                        = (1ULL << 1),
+        UHID_DEV_NUMBERED_INPUT_REPORTS                         = (1ULL << 2),
+};
+
+struct uhid_start_req {
+        __u64 dev_flags;
+};
+
 #define UHID_DATA_MAX 4096
 
 enum uhid_report_type {
@@ -182,6 +192,7 @@ struct uhid_event {
                 struct uhid_input2_req input2;
                 struct uhid_set_report_req set_report;
                 struct uhid_set_report_reply_req set_report_reply;
+                struct uhid_start_req start;
         } u;
 } __attribute__((__packed__));