Commit 0034a01a authored by Mark W. McClelland's avatar Mark W. McClelland Committed by Greg Kroah-Hartman

[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.
parent 6e277408
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
/* /*
* Version Information * 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 EMAIL "mmcclell@bigfoot.com"
#define DRIVER_AUTHOR "Mark McClelland <mmcclell@bigfoot.com> & Bret Wallach \ #define DRIVER_AUTHOR "Mark McClelland <mmcclell@bigfoot.com> & Bret Wallach \
& Orion Sky Lawlor <olawlor@acm.org> & Kevin Moore & Charl P. Botha \ & Orion Sky Lawlor <olawlor@acm.org> & Kevin Moore & Charl P. Botha \
...@@ -3882,7 +3882,10 @@ ov51x_isoc_irq(struct urb *urb) ...@@ -3882,7 +3882,10 @@ ov51x_isoc_irq(struct urb *urb)
} }
} }
/* Resubmit this URB */
urb->dev = ov->dev; urb->dev = ov->dev;
if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
err("usb_submit_urb() ret %d", i);
return; return;
} }
...@@ -3967,6 +3970,7 @@ ov51x_init_isoc(struct usb_ov511 *ov) ...@@ -3967,6 +3970,7 @@ ov51x_init_isoc(struct usb_ov511 *ov)
urb->complete = ov51x_isoc_irq; urb->complete = ov51x_isoc_irq;
urb->number_of_packets = FRAMES_PER_DESC; urb->number_of_packets = FRAMES_PER_DESC;
urb->transfer_buffer_length = ov->packet_size * FRAMES_PER_DESC; urb->transfer_buffer_length = ov->packet_size * FRAMES_PER_DESC;
urb->interval = 1;
for (fx = 0; fx < FRAMES_PER_DESC; fx++) { for (fx = 0; fx < FRAMES_PER_DESC; fx++) {
urb->iso_frame_desc[fx].offset = ov->packet_size * fx; urb->iso_frame_desc[fx].offset = ov->packet_size * fx;
urb->iso_frame_desc[fx].length = ov->packet_size; urb->iso_frame_desc[fx].length = ov->packet_size;
...@@ -3975,10 +3979,6 @@ ov51x_init_isoc(struct usb_ov511 *ov) ...@@ -3975,10 +3979,6 @@ ov51x_init_isoc(struct usb_ov511 *ov)
ov->streaming = 1; 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++) { for (n = 0; n < OV511_NUMSBUF; n++) {
ov->sbuf[n].urb->dev = ov->dev; ov->sbuf[n].urb->dev = ov->dev;
err = usb_submit_urb(ov->sbuf[n].urb, GFP_KERNEL); err = usb_submit_urb(ov->sbuf[n].urb, GFP_KERNEL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment