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
/
ultracam.c
diff --git
a/drivers/usb/media/ultracam.c
b/drivers/usb/media/ultracam.c
index
fec1f09
..
75ff755
100644
(file)
--- a/
drivers/usb/media/ultracam.c
+++ b/
drivers/usb/media/ultracam.c
@@
-155,7
+155,7
@@
static int ultracam_veio(
index,
cp,
sizeof(cp),
-
HZ
);
+
1000
);
#if 1
info("USB => %02x%02x%02x%02x%02x%02x%02x%02x "
"(req=$%02x val=$%04x ind=$%04x)",
@@
-172,7
+172,7
@@
static int ultracam_veio(
index,
NULL,
0,
-
HZ
);
+
1000
);
}
if (i < 0) {
err("%s: ERROR=%d. Camera stopped; Reconnect or reload driver.",