vserver 1.9.5.x5

[linux-2.6.git] / drivers / usb / input / kbtab.c

diff --git a/drivers/usb/input/kbtab.c b/drivers/usb/input/kbtab.c
index 39c0d38..a68c5b4 100644 (file)
--- a/drivers/usb/input/kbtab.c
+++ b/drivers/usb/input/kbtab.c
@@ -122,7 +122,7 @@ static void kbtab_close(struct input_dev *dev)
        struct kbtab *kbtab = dev->private;
 
        if (!--kbtab->open)
-               usb_unlink_urb(kbtab->irq);
+               usb_kill_urb(kbtab->irq);
 }
 
 static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *id)
@@ -175,9 +175,9 @@ 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 = dev->descriptor.idVendor;
-       kbtab->dev.id.product = dev->descriptor.idProduct;
-       kbtab->dev.id.version = dev->descriptor.bcdDevice;
+       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);
        kbtab->dev.dev = &intf->dev;
        kbtab->usbdev = dev;
 
@@ -205,7 +205,7 @@ static void kbtab_disconnect(struct usb_interface *intf)
 
        usb_set_intfdata(intf, NULL);
        if (kbtab) {
-               usb_unlink_urb(kbtab->irq);
+               usb_kill_urb(kbtab->irq);
                input_unregister_device(&kbtab->dev);
                usb_free_urb(kbtab->irq);
                usb_buffer_free(interface_to_usbdev(intf), 10, kbtab->data, kbtab->data_dma);