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

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

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index efe6159..678675b 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -213,7 +213,7 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,
                goto error;
        }
 
-       buffer = usb_buffer_alloc(dev, buffer_len,
+       buffer = usb_alloc_coherent(dev, buffer_len,
                                GFP_KERNEL, &urb->transfer_dma);
        if (!buffer) {
                ret = -ENOMEM;
@@ -232,10 +232,10 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,
        return ret;
 
 error_submit:
-       usb_buffer_free(dev,
-                       urb->transfer_buffer_length,
-                       urb->transfer_buffer,
-                       urb->transfer_dma);
+       usb_free_coherent(dev,
+                         urb->transfer_buffer_length,
+                         urb->transfer_buffer,
+                         urb->transfer_dma);
 error_buffer:
        usb_free_urb(urb);
 error:
@@ -272,10 +272,10 @@ static void gspca_input_destroy_urb(struct gspca_dev *gspca_dev)
        if (urb) {
                gspca_dev->int_urb = NULL;
                usb_kill_urb(urb);
-               usb_buffer_free(gspca_dev->dev,
-                               urb->transfer_buffer_length,
-                               urb->transfer_buffer,
-                               urb->transfer_dma);
+               usb_free_coherent(gspca_dev->dev,
+                                 urb->transfer_buffer_length,
+                                 urb->transfer_buffer,
+                                 urb->transfer_dma);
                usb_free_urb(urb);
        }
 }
@@ -605,10 +605,10 @@ static void destroy_urbs(struct gspca_dev *gspca_dev)
                gspca_dev->urb[i] = NULL;
                usb_kill_urb(urb);
                if (urb->transfer_buffer != NULL)
-                       usb_buffer_free(gspca_dev->dev,
-                                       urb->transfer_buffer_length,
-                                       urb->transfer_buffer,
-                                       urb->transfer_dma);
+                       usb_free_coherent(gspca_dev->dev,
+                                         urb->transfer_buffer_length,
+                                         urb->transfer_buffer,
+                                         urb->transfer_dma);
                usb_free_urb(urb);
        }
 }
@@ -760,13 +760,13 @@ static int create_urbs(struct gspca_dev *gspca_dev,
                        return -ENOMEM;
                }
                gspca_dev->urb[n] = urb;
-               urb->transfer_buffer = usb_buffer_alloc(gspca_dev->dev,
+               urb->transfer_buffer = usb_alloc_coherent(gspca_dev->dev,
                                                bsize,
                                                GFP_KERNEL,
                                                &urb->transfer_dma);
 
                if (urb->transfer_buffer == NULL) {
-                       err("usb_buffer_alloc failed");
+                       err("usb_alloc_coherent failed");
                        return -ENOMEM;
                }
                urb->dev = gspca_dev->dev;