2 files changed, 23 insertions, 0 deletions

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index 61ee7cc32ccf..3d1ebda122e5 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -210,6 +210,17 @@ static int uhid_dev_destroy(struct uhid_device *uhid)
         return 0;
 }
 
+static int uhid_dev_input(struct uhid_device *uhid, struct uhid_event *ev)
+{
+        if (!uhid->running)
+                return -EINVAL;
+
+        hid_input_report(uhid->hid, HID_INPUT_REPORT, ev->u.input.data,
+                         min_t(size_t, ev->u.input.size, UHID_DATA_MAX), 0);
+
+        return 0;
+}
+
 static int uhid_char_open(struct inode *inode, struct file *file)
 {
         struct uhid_device *uhid;
@@ -321,6 +332,9 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,
         case UHID_DESTROY:
                 ret = uhid_dev_destroy(uhid);
                 break;
+        case UHID_INPUT:
+                ret = uhid_dev_input(uhid, &uhid->input_buf);
+                break;
         default:
                 ret = -EOPNOTSUPP;
         }
diff --git a/include/linux/uhid.h b/include/linux/uhid.h
index 8a493e604a77..6eb42bea86a2 100644
--- a/include/linux/uhid.h
+++ b/include/linux/uhid.h
@@ -25,6 +25,7 @@
 enum uhid_event_type {
         UHID_CREATE,
         UHID_DESTROY,
+        UHID_INPUT,
 };
 
 struct uhid_create_req {
@@ -41,11 +42,19 @@ struct uhid_create_req {
         __u32 country;
 } __attribute__((__packed__));
 
+#define UHID_DATA_MAX 4096
+
+struct uhid_input_req {
+        __u8 data[UHID_DATA_MAX];
+        __u16 size;
+} __attribute__((__packed__));
+
 struct uhid_event {
         __u32 type;
 
         union {
                 struct uhid_create_req create;
+                struct uhid_input_req input;
         } u;
 } __attribute__((__packed__));