diff options
Diffstat (limited to 'drivers/usb/media/konicawc.c')
-rw-r--r-- | drivers/usb/media/konicawc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/media/konicawc.c b/drivers/usb/media/konicawc.c index 08521a2b4f3d..20ac9e1069d4 100644 --- a/drivers/usb/media/konicawc.c +++ b/drivers/usb/media/konicawc.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
19 | #include <linux/usb_input.h> | ||
19 | 20 | ||
20 | #include "usbvideo.h" | 21 | #include "usbvideo.h" |
21 | 22 | ||
@@ -845,10 +846,7 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id | |||
845 | cam->input.private = cam; | 846 | cam->input.private = cam; |
846 | cam->input.evbit[0] = BIT(EV_KEY); | 847 | cam->input.evbit[0] = BIT(EV_KEY); |
847 | cam->input.keybit[LONG(BTN_0)] = BIT(BTN_0); | 848 | cam->input.keybit[LONG(BTN_0)] = BIT(BTN_0); |
848 | cam->input.id.bustype = BUS_USB; | 849 | usb_to_input_id(dev, &cam->input.id); |
849 | cam->input.id.vendor = le16_to_cpu(dev->descriptor.idVendor); | ||
850 | cam->input.id.product = le16_to_cpu(dev->descriptor.idProduct); | ||
851 | cam->input.id.version = le16_to_cpu(dev->descriptor.bcdDevice); | ||
852 | input_register_device(&cam->input); | 850 | input_register_device(&cam->input); |
853 | 851 | ||
854 | usb_make_path(dev, cam->input_physname, 56); | 852 | usb_make_path(dev, cam->input_physname, 56); |