- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / input / mouse / appletouch.c

diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index 53ec7dd..05edd75 100644 (file)
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -806,8 +806,8 @@ static int atp_probe(struct usb_interface *iface,
        if (!dev->urb)
                goto err_free_devs;
 
-       dev->data = usb_buffer_alloc(dev->udev, dev->info->datalen, GFP_KERNEL,
-                                    &dev->urb->transfer_dma);
+       dev->data = usb_alloc_coherent(dev->udev, dev->info->datalen, GFP_KERNEL,
+                                      &dev->urb->transfer_dma);
        if (!dev->data)
                goto err_free_urb;
 
@@ -862,8 +862,8 @@ static int atp_probe(struct usb_interface *iface,
        return 0;
 
  err_free_buffer:
-       usb_buffer_free(dev->udev, dev->info->datalen,
-                       dev->data, dev->urb->transfer_dma);
+       usb_free_coherent(dev->udev, dev->info->datalen,
+                         dev->data, dev->urb->transfer_dma);
  err_free_urb:
        usb_free_urb(dev->urb);
  err_free_devs:
@@ -881,8 +881,8 @@ static void atp_disconnect(struct usb_interface *iface)
        if (dev) {
                usb_kill_urb(dev->urb);
                input_unregister_device(dev->input);
-               usb_buffer_free(dev->udev, dev->info->datalen,
-                               dev->data, dev->urb->transfer_dma);
+               usb_free_coherent(dev->udev, dev->info->datalen,
+                                 dev->data, dev->urb->transfer_dma);
                usb_free_urb(dev->urb);
                kfree(dev);
        }