summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-08-03 19:42:24 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-08-03 19:42:24 +0000
commit68c88c106593cfdc90be2ca94db91cc51685c6ee (patch)
treea6ea9b692bc98d55fb8d0f4bf9f0f76ce82399d7
parent7464dc0f81f0c09fdb32d377389f317e3398f611 (diff)
downloadmediapointer-dvb-s2-68c88c106593cfdc90be2ca94db91cc51685c6ee.tar.gz
mediapointer-dvb-s2-68c88c106593cfdc90be2ca94db91cc51685c6ee.tar.bz2
- Debug messages for no_overlay improved.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r--linux/drivers/media/video/bttv-driver.c12
-rw-r--r--v4l/ChangeLog7
2 files changed, 14 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index 2986b6f67..7e7f75e79 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.48 2005/08/03 03:23:41 mchehab Exp $
+ $Id: bttv-driver.c,v 1.49 2005/08/03 19:42:24 mchehab Exp $
bttv - Bt848 frame grabber driver
@@ -2171,9 +2171,10 @@ static int bttv_s_fmt(struct bttv_fh *fh, struct bttv *btv,
return 0;
}
case V4L2_BUF_TYPE_VIDEO_OVERLAY:
- printk ("V4L2_BUF_TYPE_VIDEO_OVERLAY called. no_overlay=%d\n",no_overlay);
- if (no_overlay)
+ if (no_overlay) {
+ printk ("V4L2_BUF_TYPE_VIDEO_OVERLAY: no_overlay=1\n");
return -EINVAL;
+ }
return setup_window(fh, btv, &f->fmt.win, 1);
case V4L2_BUF_TYPE_VBI_CAPTURE:
retval = bttv_switch_type(fh,f->type);
@@ -2327,9 +2328,10 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
struct video_window *win = arg;
struct v4l2_window w2;
- printk ("VIDIOCSWIN called. no_overlay=%d\n",no_overlay);
- if (no_overlay)
+ if (no_overlay) {
+ printk ("VIDIOCSWIN: no_overlay=1\n");
return -EINVAL;
+ }
w2.field = V4L2_FIELD_ANY;
w2.w.left = win->x;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 6df99142b..cf89855a3 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-03 19:38 mchehab
+
+ * bttv-driver.c:
+ - Debug messages for no_overlay improved.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-08-03 12:16 nshmyrev
* tveeprom.c: