Hi,
you always set the same configuration. This makes doing so quite pointless.
Regards
Oliver
You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.
===================================================================
[EMAIL PROTECTED], 2003-06-04 10:46:55+02:00, [EMAIL PROTECTED]
- cut unneeded config changes
stv680.c | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff -Nru a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
--- a/drivers/usb/media/stv680.c Wed Jun 4 10:47:53 2003
+++ b/drivers/usb/media/stv680.c Wed Jun 4 10:47:53 2003
@@ -222,13 +222,8 @@
return ret;
}
-static int stv_set_config (struct usb_stv *dev, int configuration, int interface, int
alternate)
+static int stv_set_interface_setting (struct usb_stv *dev, int interface, int
alternate)
{
-
- if (usb_set_configuration (dev->udev, configuration) < 0) {
- PDEBUG (1, "STV(e): FAILED to set configuration %i", configuration);
- return -1;
- }
if (usb_set_interface (dev->udev, interface, alternate) < 0) {
PDEBUG (1, "STV(e): FAILED to set alternate interface %i", alternate);
return -1;
@@ -255,7 +250,7 @@
PDEBUG (1, "STV(i): Camera reset to idle mode.");
}
- if ((i = stv_set_config (dev, 1, 0, 0)) < 0)
+ if ((i = stv_set_interface_setting (dev, 0, 0)) < 0)
PDEBUG (1, "STV(e): Reset config during exit failed");
/* get current mode */
@@ -293,7 +288,7 @@
return -1;
}
- if ((i = stv_set_config (dev, 1, 0, 0)) < 0) {
+ if ((i = stv_set_interface_setting (dev, 0, 0)) < 0) {
kfree (buf);
return i;
}
@@ -305,7 +300,7 @@
}
/* set alternate interface 1 */
- if ((i = stv_set_config (dev, 1, 0, 1)) < 0)
+ if ((i = stv_set_interface_setting (dev, 0, 1)) < 0)
goto error;
if ((i = stv_sndctrl (0, dev, 0x85, 0, buf, 0x10)) != 0x10)
@@ -344,7 +339,7 @@
udelay (100);
/* set config 1, interface 0, alternate 0 */
- if ((i = stv_set_config (stv680, 1, 0, 0)) < 0) {
+ if ((i = stv_set_interface_setting (stv680, 0, 0)) < 0) {
kfree (buffer);
PDEBUG (0, "STV(e): set config 1,0,0 failed");
return -1;
@@ -399,7 +394,7 @@
PDEBUG (1, "STV(i): Sensor ID is %i", (buffer[4]*16) + (buffer[5]>>4));
/* set alternate interface 1 */
- if ((i = stv_set_config (stv680, 1, 0, 1)) < 0)
+ if ((i = stv_set_interface_setting (stv680, 0, 1)) < 0)
goto error;
if ((i = stv_sndctrl (0, stv680, 0x85, 0, buffer, 0x10)) != 0x10)
===================================================================
This BitKeeper patch contains the following changesets:
1.1862
## Wrapped with gzip_uu ##
begin 664 bkpatch3717
M'XL(`#FRW3X``[V4;V_3,!#&7]>?XJ2]V1A-SW^;[EMAIL PROTECTED])H<ARW
MC;HF4^(4(?+A<9RI:!H;VT!$4<[.V3\_N7N4/3AO;)V.JLMB:VNR!V^KQJ4C
M/]ZTN2VCTK;K=A-5]=+GSJK*YR:5+:O23H8MD\^UM<VD;;(QBR3QJTZU,ROP
MJ28=T8COWKCO5S8=G9V\.?_PZHR0V0R.5KI<VD_6P6Q&LO4\;^UEM*XKO>H/
M[';ICB%22IE$+A65'[EMAIL PROTECTED]@S&.:="RA
M`LDQT(C&B@'R":H)"J"8"I5*>[EMAIL PROTECTED](88SD-?R]_B-B8`RF=="6I;6Y
MS<%4Y:)8@@FDAKP'KU<I<OJK=&3\R(L0U$A>PE7?E'E3Z:MKR:47FM?]=X9V
M3AJW53%&IE?/D")GC`M).\64F'::24:9M<HPU`MQ3X5N0#<V+_0-]'4WA!*L
MXS21+%CC[CV]5_ZM=J+-QLY]J:UQQ59'IMI$6?UE6=OEUS^*EQQ18BRQXPF3
M-%A)W#*28`\PDH(QI?_-24.M/\*X_A9N[XS3>\K^!)\=,R:!DG=#:)QVA8&B
M=."9%XUU%WYLZX4VMI^YHES"?N/JUGC937;A5\&SW&Z?ASV[M<-47_IIJ9T]
MZ([EMAIL PROTECTED]&T$$;%`O;W"YC==UB`H[\/#N"%?WI&H@(CA"<QX`<YYAB4#.%1
M%+I3PL4T,$)X$&/HU"TQ`ED/&L)C03L]N[^X65FS;MK-C$T99D)I\A.A>Y<=
$0P8`````
`
end
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The best
thread debugger on the planet. Designed with thread debugging features
you've never dreamed of, try TotalView 6 free at www.etnus.com.
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
