diff options
Diffstat (limited to 'drivers/usb/input/usbkbd.c')
-rw-r--r-- | drivers/usb/input/usbkbd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c index f35db1974c4..28987f15eee 100644 --- a/drivers/usb/input/usbkbd.c +++ b/drivers/usb/input/usbkbd.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <linux/input.h> | 32 | #include <linux/input.h> |
33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
34 | #include <linux/usb.h> | 34 | #include <linux/usb.h> |
35 | #include <linux/usb_input.h> | ||
35 | 36 | ||
36 | /* | 37 | /* |
37 | * Version Information | 38 | * Version Information |
@@ -288,10 +289,7 @@ static int usb_kbd_probe(struct usb_interface *iface, | |||
288 | 289 | ||
289 | kbd->dev.name = kbd->name; | 290 | kbd->dev.name = kbd->name; |
290 | kbd->dev.phys = kbd->phys; | 291 | kbd->dev.phys = kbd->phys; |
291 | kbd->dev.id.bustype = BUS_USB; | 292 | usb_to_input_id(dev, &kbd->dev.id); |
292 | kbd->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor); | ||
293 | kbd->dev.id.product = le16_to_cpu(dev->descriptor.idProduct); | ||
294 | kbd->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice); | ||
295 | kbd->dev.dev = &iface->dev; | 293 | kbd->dev.dev = &iface->dev; |
296 | 294 | ||
297 | if (dev->manufacturer) | 295 | if (dev->manufacturer) |