# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.467 -> 1.468 # drivers/usb/media/ov511.c 1.27 -> 1.28 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/06/07 mark@alpha.dyndns.org 1.468 # [PATCH] 2.5.20 ov511.c compile fixes # # This patch allows ov511 to build again by removing references to # urb->next. It now resubmits in the completion handler and properly sets # urb->interval. # -------------------------------------------- # diff -Nru a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c --- a/drivers/usb/media/ov511.c Sat Jun 8 15:16:13 2002 +++ b/drivers/usb/media/ov511.c Sat Jun 8 15:16:13 2002 @@ -61,7 +61,7 @@ /* * Version Information */ -#define DRIVER_VERSION "v1.60 for Linux 2.5" +#define DRIVER_VERSION "v1.60a for Linux 2.5" #define EMAIL "mmcclell@bigfoot.com" #define DRIVER_AUTHOR "Mark McClelland & Bret Wallach \ & Orion Sky Lawlor & Kevin Moore & Charl P. Botha \ @@ -3882,7 +3882,10 @@ } } + /* Resubmit this URB */ urb->dev = ov->dev; + if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0) + err("usb_submit_urb() ret %d", i); return; } @@ -3967,6 +3970,7 @@ urb->complete = ov51x_isoc_irq; urb->number_of_packets = FRAMES_PER_DESC; urb->transfer_buffer_length = ov->packet_size * FRAMES_PER_DESC; + urb->interval = 1; for (fx = 0; fx < FRAMES_PER_DESC; fx++) { urb->iso_frame_desc[fx].offset = ov->packet_size * fx; urb->iso_frame_desc[fx].length = ov->packet_size; @@ -3974,10 +3978,6 @@ } ov->streaming = 1; - - ov->sbuf[OV511_NUMSBUF - 1].urb->next = ov->sbuf[0].urb; - for (n = 0; n < OV511_NUMSBUF - 1; n++) - ov->sbuf[n].urb->next = ov->sbuf[n+1].urb; for (n = 0; n < OV511_NUMSBUF; n++) { ov->sbuf[n].urb->dev = ov->dev;