---

yaml --- r: 137715 b: refs/heads/master c: f97d207 h: refs/heads/master i: 137713: 402fe4f 137711: bcdf8b8 v: v3
git-mirror · Mar 30, 2009 · 7aa85b4 · 7aa85b4
1 parent 05e7f5e
commit 7aa85b4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b960074fec573fb1b226d9e2686ce51be807cdf1
+refs/heads/master: f97d2074e364d51dde91d2a94a262466815d13ce
diff --git a/trunk/drivers/media/dvb/ttpci/av7110_v4l.c b/trunk/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -519,7 +519,8 @@ static int vidioc_g_sliced_vbi_cap(struct file *file, void *fh,
 	struct av7110 *av7110 = (struct av7110 *)dev->ext_priv;
 
 	dprintk(2, "VIDIOC_G_SLICED_VBI_CAP\n");
-	memset(cap, 0, sizeof(*cap));
+	if (cap->type != V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
+		return -EINVAL;
 	if (FW_VERSION(av7110->arm_app) >= 0x2623) {
 		cap->service_set = V4L2_SLICED_WSS_625;
 		cap->service_lines[0][23] = V4L2_SLICED_WSS_625;