diff options
Diffstat (limited to 'linux/drivers/media/video/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 7e7f75e79..a91c59148 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.49 2005/08/03 19:42:24 mchehab Exp $ + $Id: bttv-driver.c,v 1.50 2005/08/03 20:21:15 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -2171,8 +2171,8 @@ static int bttv_s_fmt(struct bttv_fh *fh, struct bttv *btv, return 0; } case V4L2_BUF_TYPE_VIDEO_OVERLAY: - if (no_overlay) { - printk ("V4L2_BUF_TYPE_VIDEO_OVERLAY: no_overlay=1\n"); + if (no_overlay > 0) { + printk ("V4L2_BUF_TYPE_VIDEO_OVERLAY: no_overlay\n"); return -EINVAL; } return setup_window(fh, btv, &f->fmt.win, 1); @@ -2250,7 +2250,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, VID_TYPE_TUNER| VID_TYPE_CLIPPING| VID_TYPE_SCALES; - if (!no_overlay) + if (no_overlay <= 0) cap->type |= VID_TYPE_OVERLAY; cap->maxwidth = bttv_tvnorms[btv->tvnorm].swidth; @@ -2328,8 +2328,8 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, struct video_window *win = arg; struct v4l2_window w2; - if (no_overlay) { - printk ("VIDIOCSWIN: no_overlay=1\n"); + if (no_overlay > 0) { + printk ("VIDIOCSWIN: no_overlay\n"); return -EINVAL; } @@ -2611,7 +2611,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, V4L2_CAP_VBI_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; - if (!no_overlay) + if (no_overlay <= 0) cap->capabilities |= V4L2_CAP_VIDEO_OVERLAY; if (bttv_tvcards[btv->c.type].tuner != UNSET && @@ -3793,7 +3793,7 @@ static void bttv_unregister_video(struct bttv *btv) /* register video4linux devices */ static int __devinit bttv_register_video(struct bttv *btv) { - if (!no_overlay) + if (no_overlay <= 0) bttv_video_template.type |= VID_TYPE_OVERLAY; /* video */ |