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.
The driver compiles fine now, but I can't promise that it works since
2.5.20 wouldn't boot for me.
Please apply. Thanks!
--
Mark McClelland
[EMAIL PROTECTED]
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.593 -> 1.594
# drivers/usb/media/ov511.c 1.25 -> 1.26
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/06/06 [EMAIL PROTECTED] 1.594
# This updates the ov511 driver for the recent USB API changes, by
# removing urb->next and setting urb->interval.
# --------------------------------------------
#
diff -Nru a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c
--- a/drivers/usb/media/ov511.c Thu Jun 6 21:07:36 2002
+++ b/drivers/usb/media/ov511.c Thu Jun 6 21:07:36 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 "[EMAIL PROTECTED]"
#define DRIVER_AUTHOR "Mark McClelland <[EMAIL PROTECTED]> & Bret Wallach \
& Orion Sky Lawlor <[EMAIL PROTECTED]> & 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;
===================================================================
This BitKeeper patch contains the following changesets:
1.594
## Wrapped with gzip_uu ##
begin 664 bkpatch1868
M'XL(`(@Q`#T``ZV4:V^;,!2&/^-?<99J4M(5L`WFDBI5+^FZ:-T:I<V^1H"=
M@!(@,D[62OSX&3JU2R^JU@ULA&R?V^O'WH-I)63?R".Y1'OPI:Q4WTBC58@Q
MMOA=P8O**N5"3TW*4D_9>:'LM,P%M1L36^5K.U[:FRHVJ<607C>.5)+"5LBJ
M;Q#+>1A1=VO1-R;G%]/+DPE"@P&<I5&Q$-="P6"`XN4QWXB5M91EE#8AZX?I
MFF),"*$,.\PCK*:!X[@U\7#,]2^G?CB/O1`MI%@<WYLG9;YK3K&G7T8#YM:>
M=N6C(1"+A2Y@:F-/-Z"DCUG?82;V^QA#4]WQ<R'@$P$3HU/X]WS/4`(W:5;!
M9LTC)2I0J8!RRP@!+C,M(,Q+V0Y*D8A"P?3Z%$[&(TC:0-4!Q'?:A11YN<V*
M!6QD;!X5XE9!5'"HA%(/HUFAA-Q&*PM]!8\$)$#C1_61^9</0CC"Z.@%">[S
MKAH<[+82*WD4P\4A\6HGQ"&MJ>-R1T0XB9D3<O\UM7<<YH)GT9]NFTWUM5OF
MD-IC#@Y:JEXU>9FR]Z;\%+<W,F74QY1YV*TQ9GKS&_RH]XP^\A9]#$SVW^@S
M8=+`TP`V%U(420-A^00D*:I-G&<*YK+,09>Z7@F5E07H@'PE9.NG.<0[I#6@
MM5MR!:;\V38-SOCUW7D'A4//!8)&[7>/BWE6"!A.1C_.)S/=KT=7WZ&S)9:'
MH_8D76;%YA;T+=5!(R<(&BO#WM<2_*Y/-6=Q.CF%?;M=P(`B(YM#MYO!`'3"
ML_N%,UUH5_<#N/@\GIW<7'T;G?5Z\&$`N(<,0TC9[3Q9W=,J*OC(.P>0]0ZU
K]]`+F_#&CF8Z"CE$0R?T?7`?K](D%<FRVN0#(3@)O+E`OP"57Y#*M04`````
`
end
