git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'dmapool' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zr36050.c
diff --git
a/drivers/media/video/zr36050.c
b/drivers/media/video/zr36050.c
index
9f622e0
..
faae4ec
100644
(file)
--- a/
drivers/media/video/zr36050.c
+++ b/
drivers/media/video/zr36050.c
@@
-161,7
+161,7
@@
zr36050_wait_end (struct zr36050 *ptr)
udelay(1);
if (i++ > 200000) { // 200ms, there is for sure something wrong!!!
dprintk(1,
- "%s: timout at wait_end (last status: 0x%02x)\n",
+ "%s: tim
e
out at wait_end (last status: 0x%02x)\n",
ptr->name, ptr->status1);
break;
}