Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / media / usb / uvc / uvc_isight.c

diff --git a/drivers/media/usb/uvc/uvc_isight.c b/drivers/media/usb/uvc/uvc_isight.c
index 81e6f2187bfb032e9537b8267ceac6988852dcaa..39a4e4482b2378e72f02b9fb3f9945bede6d694c 100644 (file)
--- a/drivers/media/usb/uvc/uvc_isight.c
+++ b/drivers/media/usb/uvc/uvc_isight.c
@@ -99,9 +99,11 @@ static int isight_decode(struct uvc_video_queue *queue, struct uvc_buffer *buf,
        return 0;
 }
 
-void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream,
-                       struct uvc_buffer *buf, struct uvc_buffer *meta_buf)
+void uvc_video_decode_isight(struct uvc_urb *uvc_urb, struct uvc_buffer *buf,
+                       struct uvc_buffer *meta_buf)
 {
+       struct urb *urb = uvc_urb->urb;
+       struct uvc_streaming *stream = uvc_urb->stream;
        int ret, i;
 
        for (i = 0; i < urb->number_of_packets; ++i) {