diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-30 00:49:08 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-30 00:49:08 -0500 |
| commit | 16a334c0de5a94b1d10a1ac9a33f4dedac89a075 (patch) | |
| tree | bb01b1185d806994cd318a7af68a438a9e57c2a2 /drivers/usb/input/usbkbd.c | |
| parent | c27a748225fe5c7e485ea471178c26e43f9f7fbe (diff) | |
Input: introduce usb_to_input_id() to uniformly produce
struct input_id for USB input devices.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
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 @@ #include <linux/input.h> #include <linux/init.h> #include <linux/usb.h> +#include <linux/usb_input.h> /* * Version Information @@ -288,10 +289,7 @@ static int usb_kbd_probe(struct usb_interface *iface, kbd->dev.name = kbd->name; kbd->dev.phys = kbd->phys; - kbd->dev.id.bustype = BUS_USB; - kbd->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor); - kbd->dev.id.product = le16_to_cpu(dev->descriptor.idProduct); - kbd->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice); + usb_to_input_id(dev, &kbd->dev.id); kbd->dev.dev = &iface->dev; if (dev->manufacturer) |