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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
media
/
video
/
w9966.c
diff --git
a/drivers/media/video/w9966.c
b/drivers/media/video/w9966.c
index
4bdc886
..
8d14f30
100644
(file)
--- a/
drivers/media/video/w9966.c
+++ b/
drivers/media/video/w9966.c
@@
-789,7
+789,7
@@
static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
case VIDIOCSPICT:
{
struct video_picture *vpic = arg;
case VIDIOCSPICT:
{
struct video_picture *vpic = arg;
- if (vpic->depth != 16 ||
vpic->palette != VIDEO_PALETTE_YUV422
)
+ if (vpic->depth != 16 ||
(vpic->palette != VIDEO_PALETTE_YUV422 && vpic->palette != VIDEO_PALETTE_YUYV)
)
return -EINVAL;
cam->brightness = vpic->brightness >> 8;
return -EINVAL;
cam->brightness = vpic->brightness >> 8;