import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / hid / uhid.c

diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index fc307e0422afc92c31bfac65d410244d5859e804..e4e4a4eabc065dea5a0c6a334028473b4629b2f2 100644 (file)
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -312,7 +312,7 @@ static int uhid_event_from_user(const char __user *buffer, size_t len,
                         */
                        struct uhid_create_req_compat *compat;
 
-                       compat = kmalloc(sizeof(*compat), GFP_KERNEL);
+                       compat = kzalloc(sizeof(*compat), GFP_KERNEL);
                        if (!compat)
                                return -ENOMEM;
 
@@ -405,8 +405,8 @@ static int uhid_dev_create(struct uhid_device *uhid,
        hid->hid_get_raw_report = uhid_hid_get_raw;
        hid->hid_output_raw_report = uhid_hid_output_raw;
        hid->bus = ev->u.create.bus;
-       hid->vendor = ev->u.create.vendor;
-       hid->product = ev->u.create.product;
+    hid->vendor = ev->u.create.vendor;
+    hid->product = ev->u.create.product;
        hid->version = ev->u.create.version;
        hid->country = ev->u.create.country;
        hid->driver_data = uhid;
@@ -640,7 +640,7 @@ static const struct file_operations uhid_fops = {
 
 static struct miscdevice uhid_misc = {
        .fops           = &uhid_fops,
-       .minor          = MISC_DYNAMIC_MINOR,
+       .minor          = UHID_MINOR,
        .name           = UHID_NAME,
 };
 
@@ -659,3 +659,5 @@ module_exit(uhid_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>");
 MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem");
+MODULE_ALIAS_MISCDEV(UHID_MINOR);
+MODULE_ALIAS("devname:" UHID_NAME);