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>

diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index b083338823dfff4559a16d938d588a2550b3e066..616a35da191d335c1ad8195043d1fa9086d66ccb 100644 (file)
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -923,7 +923,7 @@ static int meye_do_ioctl(struct inode *inode, struct file *file,
                struct video_picture *p = arg;
                if (p->depth != 16)
                        return -EINVAL;
-               if (p->palette != VIDEO_PALETTE_YUV422)
+               if (p->palette != VIDEO_PALETTE_YUV422 && p->palette != VIDEO_PALETTE_YUYV)
                        return -EINVAL;
                mutex_lock(&meye.lock);
                sonypi_camera_command(SONYPI_COMMAND_SETCAMERABRIGHTNESS,
@@ -978,7 +978,7 @@ static int meye_do_ioctl(struct inode *inode, struct file *file,
 
                if (vm->frame >= gbuffers || vm->frame < 0)
                        return -EINVAL;
-               if (vm->format != VIDEO_PALETTE_YUV422)
+               if (vm->format != VIDEO_PALETTE_YUV422 && vm->format != VIDEO_PALETTE_YUYV)
                        return -EINVAL;
                if (vm->height * vm->width * 2 > gbufsize)
                        return -EINVAL;

diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c
index 4bdc886abc4c69e5afa2ece884d5be8977392ce8..8d14f308f171a9087a9ff87fc64627489c69664e 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;
-               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;

diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 168e431d7c716e56b5cd924047032901cff31e64..b0752767ee4f5195df9144a42712837d4eedfd47 100644 (file)
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -429,7 +429,7 @@ zr36057_set_vfe (struct zoran              *zr,
        reg |= (HorDcm << ZR36057_VFESPFR_HorDcm);
        reg |= (VerDcm << ZR36057_VFESPFR_VerDcm);
        reg |= (DispMode << ZR36057_VFESPFR_DispMode);
-       if (format->palette != VIDEO_PALETTE_YUV422)
+       if (format->palette != VIDEO_PALETTE_YUV422 && format->palette != VIDEO_PALETTE_YUYV)
                reg |= ZR36057_VFESPFR_LittleEndian;
        /* RJ: I don't know, why the following has to be the opposite
         * of the corresponding ZR36060 setting, but only this way
@@ -441,6 +441,7 @@ zr36057_set_vfe (struct zoran              *zr,
        reg |= ZR36057_VFESPFR_TopField;
        switch (format->palette) {
 
+       case VIDEO_PALETTE_YUYV:
        case VIDEO_PALETTE_YUV422:
                reg |= ZR36057_VFESPFR_YUV422;
                break;