summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pms.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-21 15:26:11 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-21 15:26:11 -0300
commit37cd1fdb9dd4dc835d2cbd05ebd12b39593bfd42 (patch)
tree974f630d6a67db2bd28e20fc55a3f076483d36e4 /linux/drivers/media/video/pms.c
parent16659a1919874e2a99f44778de6594b8a6b3f65f (diff)
parent6cfc8eeff6261fb1153a67e5bc3c71616f332044 (diff)
downloadmediapointer-dvb-s2-37cd1fdb9dd4dc835d2cbd05ebd12b39593bfd42.tar.gz
mediapointer-dvb-s2-37cd1fdb9dd4dc835d2cbd05ebd12b39593bfd42.tar.bz2
merge: http://linuxtv.org/hg/~rmcc/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pms.c')
-rw-r--r--linux/drivers/media/video/pms.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pms.c b/linux/drivers/media/video/pms.c
index d129072a9..e13a7f8b8 100644
--- a/linux/drivers/media/video/pms.c
+++ b/linux/drivers/media/video/pms.c
@@ -812,7 +812,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
struct video_picture *p = arg;
if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16)
||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15)))
- return -EINVAL;
+ return -EINVAL;
pd->picture= *p;
/*