]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
HID: cp2112: use proper hidraw name with minor number
authorJaejoong Kim <climbbb.kim@gmail.com>
Fri, 3 Mar 2017 08:54:00 +0000 (17:54 +0900)
committerJiri Kosina <jkosina@suse.cz>
Tue, 21 Mar 2017 14:20:39 +0000 (15:20 +0100)
The cp2112 driver is working on hidraw not hiddev. So we need to use proper
hidraw name with hidraw's minor number.

Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jaejoong Kim <climbbb.kim@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/hid-cp2112.c

index b22d0f83f8e38a9ee0d0eb7381e95d6b90442b61..078026f63b6f40999a2aa1feb8023d3905a6044c 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio/driver.h>
 #include <linux/hid.h>
+#include <linux/hidraw.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/nls.h>
@@ -1297,7 +1298,8 @@ static int cp2112_probe(struct hid_device *hdev, const struct hid_device_id *id)
        dev->adap.algo_data     = dev;
        dev->adap.dev.parent    = &hdev->dev;
        snprintf(dev->adap.name, sizeof(dev->adap.name),
-                "CP2112 SMBus Bridge on hiddev%d", hdev->minor);
+                "CP2112 SMBus Bridge on hidraw%d",
+                ((struct hidraw *)hdev->hidraw)->minor);
        dev->hwversion = buf[2];
        init_waitqueue_head(&dev->wait);