/spare/repo/netdev-2.6 branch 'master'

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index d2f0f90a9bcd..b6f6ac8d9c2f 100644
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -4,6 +4,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/usb.h>
+#include <linux/usb_input.h>
 #include <asm/unaligned.h>
 #include <asm/byteorder.h>
 
@@ -167,10 +168,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
 
         kbtab->dev.name = "KB Gear Tablet";
         kbtab->dev.phys = kbtab->phys;
-        kbtab->dev.id.bustype = BUS_USB;
-        kbtab->dev.id.vendor = le16_to_cpu(dev->descriptor.idVendor);
-        kbtab->dev.id.product = le16_to_cpu(dev->descriptor.idProduct);
-        kbtab->dev.id.version = le16_to_cpu(dev->descriptor.bcdDevice);
+        usb_to_input_id(dev, &kbtab->dev.id);
         kbtab->dev.dev = &intf->dev;
         kbtab->usbdev = dev;