diff options
author | audetto@tiscali.it <audetto@tiscali.it> | 2006-12-12 08:35:57 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-27 11:18:50 -0500 |
commit | 2485eb0a553f2ac8c73267ce48fcdee8a9728d43 (patch) | |
tree | b8f042aff5add599d0359ac58e7ae198cd00637a /drivers/media/video/meye.c | |
parent | c6268461473e1c62e31afde657069c050ee8dea7 (diff) |
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, | |||
923 | struct video_picture *p = arg; | 923 | struct video_picture *p = arg; |
924 | if (p->depth != 16) | 924 | if (p->depth != 16) |
925 | return -EINVAL; | 925 | return -EINVAL; |
926 | if (p->palette != VIDEO_PALETTE_YUV422) | 926 | if (p->palette != VIDEO_PALETTE_YUV422 && p->palette != VIDEO_PALETTE_YUYV) |
927 | return -EINVAL; | 927 | return -EINVAL; |
928 | mutex_lock(&meye.lock); | 928 | mutex_lock(&meye.lock); |
929 | sonypi_camera_command(SONYPI_COMMAND_SETCAMERABRIGHTNESS, | 929 | sonypi_camera_command(SONYPI_COMMAND_SETCAMERABRIGHTNESS, |
@@ -978,7 +978,7 @@ static int meye_do_ioctl(struct inode *inode, struct file *file, | |||
978 | 978 | ||
979 | if (vm->frame >= gbuffers || vm->frame < 0) | 979 | if (vm->frame >= gbuffers || vm->frame < 0) |
980 | return -EINVAL; | 980 | return -EINVAL; |
981 | if (vm->format != VIDEO_PALETTE_YUV422) | 981 | if (vm->format != VIDEO_PALETTE_YUV422 && vm->format != VIDEO_PALETTE_YUYV) |
982 | return -EINVAL; | 982 | return -EINVAL; |
983 | if (vm->height * vm->width * 2 > gbufsize) | 983 | if (vm->height * vm->width * 2 > gbufsize) |
984 | return -EINVAL; | 984 | return -EINVAL; |