summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134
diff options
context:
space:
mode:
authorGerd Knorr <devnull@localhost>2004-03-15 12:46:39 +0000
committerGerd Knorr <devnull@localhost>2004-03-15 12:46:39 +0000
commitd846a435c328a8bca2b9f4a16fe7d93e783461f5 (patch)
tree25ae4db7a87cdce34760a7f7384afe9bff37f15d /linux/drivers/media/video/saa7134
parenta4aa47a04f79c3c3818091f8021a0cf8ee40b8aa (diff)
downloadmediapointer-dvb-s2-d846a435c328a8bca2b9f4a16fe7d93e783461f5.tar.gz
mediapointer-dvb-s2-d846a435c328a8bca2b9f4a16fe7d93e783461f5.tar.bz2
- cropcap fixes.
- v4l1-compat fix.
Diffstat (limited to 'linux/drivers/media/video/saa7134')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-video.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-video.c b/linux/drivers/media/video/saa7134/saa7134-video.c
index e281def4f..e40656144 100644
--- a/linux/drivers/media/video/saa7134/saa7134-video.c
+++ b/linux/drivers/media/video/saa7134/saa7134-video.c
@@ -1693,7 +1693,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
{
struct v4l2_cropcap *cap = arg;
- if (cap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+ if (cap->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
cap->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
return -EINVAL;
cap->bounds = dev->crop_bounds;
@@ -1715,7 +1715,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
{
struct v4l2_crop * crop = arg;
- if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+ if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
crop->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
return -EINVAL;
crop->c = dev->crop_current;
@@ -1726,7 +1726,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
struct v4l2_crop *crop = arg;
struct v4l2_rect *b = &dev->crop_bounds;
- if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ||
+ if (crop->type != V4L2_BUF_TYPE_VIDEO_CAPTURE &&
crop->type != V4L2_BUF_TYPE_VIDEO_OVERLAY)
return -EINVAL;
if (crop->c.height < 0)