USB: rename usb_buffer_alloc() and usb_buffer_free() users

[pandora-kernel.git] / drivers / media / video / uvc / uvc_video.c

diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 821a996..53f3ef4 100644 (file)
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -739,7 +739,7 @@ static void uvc_free_urb_buffers(struct uvc_streaming *stream)
 
        for (i = 0; i < UVC_URBS; ++i) {
                if (stream->urb_buffer[i]) {
-                       usb_buffer_free(stream->dev->udev, stream->urb_size,
+                       usb_free_coherent(stream->dev->udev, stream->urb_size,
                                stream->urb_buffer[i], stream->urb_dma[i]);
                        stream->urb_buffer[i] = NULL;
                }
@@ -780,7 +780,7 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
        for (; npackets > 1; npackets /= 2) {
                for (i = 0; i < UVC_URBS; ++i) {
                        stream->urb_size = psize * npackets;
-                       stream->urb_buffer[i] = usb_buffer_alloc(
+                       stream->urb_buffer[i] = usb_alloc_coherent(
                                stream->dev->udev, stream->urb_size,
                                gfp_flags | __GFP_NOWARN, &stream->urb_dma[i]);
                        if (!stream->urb_buffer[i]) {