From 2485eb0a553f2ac8c73267ce48fcdee8a9728d43 Mon Sep 17 00:00:00 2001 From: "audetto@tiscali.it" Date: Tue, 12 Dec 2006 10:35:57 -0300 Subject: V4L/DVB (4964): VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422 are the same palette Consistent handling of VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422 Signed-off-by: Andrea A Odetti Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/w9966.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/media/video/w9966.c') diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index 4bdc886abc4..8d14f308f17 100644 --- 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; - 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; -- cgit v1.2.3