From a935346fdc09d5ab442f9375e0674e92ad7d2965 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Sun, 2 Jan 2011 15:11:43 +0100 Subject: usb-skeleton: Use usb_[alloc|free]_coherent instead of usb_buffer_[alloc|free] --- usb/usb-skeleton.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usb/usb-skeleton.c b/usb/usb-skeleton.c index 723deef..85861ab 100644 --- a/usb/usb-skeleton.c +++ b/usb/usb-skeleton.c @@ -145,7 +145,7 @@ static void skel_write_bulk_callback(struct urb *urb) } /* free up our allocated buffer */ - usb_buffer_free(urb->dev, urb->transfer_buffer_length, + usb_free_coherent(urb->dev, urb->transfer_buffer_length, urb->transfer_buffer, urb->transfer_dma); } @@ -169,7 +169,7 @@ static ssize_t skel_write(struct file *file, const char __user *user_buffer, siz goto error; } - buf = usb_buffer_alloc(dev->udev, count, GFP_KERNEL, &urb->transfer_dma); + buf = usb_alloc_coherent(dev->udev, count, GFP_KERNEL, &urb->transfer_dma); if (!buf) { retval = -ENOMEM; goto error; @@ -199,7 +199,7 @@ exit: return count; error: - usb_buffer_free(dev->udev, count, buf, urb->transfer_dma); + usb_free_coherent(dev->udev, count, buf, urb->transfer_dma); usb_free_urb(urb); kfree(buf); return retval; -- cgit v1.2.1-18-gbd029