diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 09:48:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-29 09:48:34 -0700 |
| commit | e0d7ff168a71299919f01500b3d507aae0c67513 (patch) | |
| tree | de2a7807ec5642e7389191e66d8c5d6d1249096a /drivers/usb/media | |
| parent | ca49a601c2b4b74e5cf57fef62122204d1982372 (diff) | |
| parent | 33fdfa97f2b3aab698ef849ec50dcc5102017f0a (diff) | |
| download | blackbird-op-linux-e0d7ff168a71299919f01500b3d507aae0c67513.tar.gz blackbird-op-linux-e0d7ff168a71299919f01500b3d507aae0c67513.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/usb/media')
| -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 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/input.h> +#include <linux/usb_input.h> #include "usbvideo.h" @@ -845,10 +846,7 @@ static int konicawc_probe(struct usb_interface *intf, const struct usb_device_id cam->input.private = cam; cam->input.evbit[0] = BIT(EV_KEY); cam->input.keybit[LONG(BTN_0)] = BIT(BTN_0); - cam->input.id.bustype = BUS_USB; - cam->input.id.vendor = le16_to_cpu(dev->descriptor.idVendor); - cam->input.id.product = le16_to_cpu(dev->descriptor.idProduct); - cam->input.id.version = le16_to_cpu(dev->descriptor.bcdDevice); + usb_to_input_id(dev, &cam->input.id); input_register_device(&cam->input); usb_make_path(dev, cam->input_physname, 56); |
