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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
zoran
/
zoran_driver.c
diff --git
a/drivers/media/video/zoran/zoran_driver.c
b/drivers/media/video/zoran/zoran_driver.c
index
c155ddf
..
401082b
100644
(file)
--- a/
drivers/media/video/zoran/zoran_driver.c
+++ b/
drivers/media/video/zoran/zoran_driver.c
@@
-1177,7
+1177,7
@@
static int setup_window(struct zoran_fh *fh, int x, int y, int width, int height
if (height > BUZ_MAX_HEIGHT)
height = BUZ_MAX_HEIGHT;
- /* Check for
vail
d parameters */
+ /* Check for
invali
d parameters */
if (width < BUZ_MIN_WIDTH || height < BUZ_MIN_HEIGHT ||
width > BUZ_MAX_WIDTH || height > BUZ_MAX_HEIGHT) {
dprintk(1,