diff options
Diffstat (limited to 'drivers/usb/input/wacom.c')
-rw-r--r-- | drivers/usb/input/wacom.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/input/wacom.c b/drivers/usb/input/wacom.c index f6b34af66b3d..02412e31a46b 100644 --- a/drivers/usb/input/wacom.c +++ b/drivers/usb/input/wacom.c | |||
@@ -69,6 +69,7 @@ | |||
69 | #include <linux/module.h> | 69 | #include <linux/module.h> |
70 | #include <linux/init.h> | 70 | #include <linux/init.h> |
71 | #include <linux/usb.h> | 71 | #include <linux/usb.h> |
72 | #include <linux/usb_input.h> | ||
72 | #include <asm/unaligned.h> | 73 | #include <asm/unaligned.h> |
73 | #include <asm/byteorder.h> | 74 | #include <asm/byteorder.h> |
74 | 75 | ||
@@ -823,10 +824,7 @@ static int wacom_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
823 | 824 | ||
824 | wacom->dev.name = wacom->features->name; | 825 | wacom->dev.name = wacom->features->name; |
825 | wacom->dev.phys = wacom->phys; | 826 | wacom->dev.phys = wacom->phys; |
826 | wacom->dev.id.bustype = BUS_USB; | 827 | usb_to_input_id(dev, &wacom->dev.id); |
827 | wacom->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor); | ||
828 | wacom->dev.id.product = le16_to_cpu(dev->descriptor.idProduct); | ||
829 | wacom->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice); | ||
830 | wacom->dev.dev = &intf->dev; | 828 | wacom->dev.dev = &intf->dev; |
831 | wacom->usbdev = dev; | 829 | wacom->usbdev = dev; |
832 | 830 | ||