git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
usb
/
media
/
ibmcam.c
diff --git
a/drivers/usb/media/ibmcam.c
b/drivers/usb/media/ibmcam.c
index
64eb7ca
..
ba41fc7
100644
(file)
--- a/
drivers/usb/media/ibmcam.c
+++ b/
drivers/usb/media/ibmcam.c
@@
-1036,7
+1036,8
@@
static enum ParseState ibmcam_model4_128x96_parse_lines(
* History:
* 1/21/00 Created.
*/
* History:
* 1/21/00 Created.
*/
-void ibmcam_ProcessIsocData(struct uvd *uvd, struct usbvideo_frame *frame)
+static void ibmcam_ProcessIsocData(struct uvd *uvd,
+ struct usbvideo_frame *frame)
{
enum ParseState newstate;
long copylen = 0;
{
enum ParseState newstate;
long copylen = 0;
@@
-1137,7
+1138,7
@@
static int ibmcam_veio(
index,
cp,
sizeof(cp),
index,
cp,
sizeof(cp),
-
HZ
);
+
1000
);
#if 0
info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
"(req=$%02x val=$%04x ind=$%04x)",
#if 0
info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
"(req=$%02x val=$%04x ind=$%04x)",
@@
-1154,7
+1155,7
@@
static int ibmcam_veio(
index,
NULL,
0,
index,
NULL,
0,
-
HZ
);
+
1000
);
}
if (i < 0) {
err("%s: ERROR=%d. Camera stopped; Reconnect or reload driver.",
}
if (i < 0) {
err("%s: ERROR=%d. Camera stopped; Reconnect or reload driver.",