diff options
| author | audetto@tiscali.it <audetto@tiscali.it> | 2006-12-12 14:35:57 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 17:18:50 +0100 |
| commit | 2485eb0a553f2ac8c73267ce48fcdee8a9728d43 (patch) | |
| tree | b8f042aff5add599d0359ac58e7ae198cd00637a /drivers/media/video/meye.c | |
| parent | V4L/DVB (4960): Removal of unused code from usbvision-i2c.c (diff) | |
| download | linux-2485eb0a553f2ac8c73267ce48fcdee8a9728d43.tar.xz linux-2485eb0a553f2ac8c73267ce48fcdee8a9728d43.zip | |
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>
Diffstat (limited to 'drivers/media/video/meye.c')
| -rw-r--r-- | drivers/media/video/meye.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index b083338823df..616a35da191d 100644 --- 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; |