commit 2485eb0a553f2ac8c73267ce48fcdee8a9728d43
author audetto@tiscali.it <audetto@tiscali.it> Tue Dec 12 10:35:57 2006 -0300
committer Mauro Carvalho Chehab <mchehab@infradead.org> Wed Dec 27 14:18:50 2006 -0200
tree b8f042aff5add599d0359ac58e7ae198cd00637a
parent c6268461473e1c62e31afde657069c050ee8dea7

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 <audetto@tiscali.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

drivers/media/video/w9966.c

diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 4bdc886..8d14f30 100644
--- a/drivers/media/video/w9966.c
+++ b/drivers/media/video/w9966.c
@@ -789,7 +789,7 @@
 	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;