Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[pandora-kernel.git] / drivers / input / tablet / kbtab.c

diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
index b9969f1..290f4e5 100644 (file)
--- a/drivers/input/tablet/kbtab.c
+++ b/drivers/input/tablet/kbtab.c
@@ -122,7 +122,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
        if (!kbtab || !input_dev)
                goto fail1;
 
-       kbtab->data = usb_buffer_alloc(dev, 8, GFP_KERNEL, &kbtab->data_dma);
+       kbtab->data = usb_alloc_coherent(dev, 8, GFP_KERNEL, &kbtab->data_dma);
        if (!kbtab->data)
                goto fail1;
 
@@ -173,7 +173,7 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
        return 0;
 
  fail3:        usb_free_urb(kbtab->irq);
- fail2:        usb_buffer_free(dev, 8, kbtab->data, kbtab->data_dma);
+ fail2:        usb_free_coherent(dev, 8, kbtab->data, kbtab->data_dma);
  fail1:        input_free_device(input_dev);
        kfree(kbtab);
        return error;
@@ -187,7 +187,7 @@ static void kbtab_disconnect(struct usb_interface *intf)
 
        input_unregister_device(kbtab->dev);
        usb_free_urb(kbtab->irq);
-       usb_buffer_free(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
+       usb_free_coherent(kbtab->usbdev, 8, kbtab->data, kbtab->data_dma);
        kfree(kbtab);
 }