From 7aa85b4b561e9bd1450bb691e46e8b54915a1ef0 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 19 Jan 2009 04:14:17 -0300 Subject: [PATCH] --- yaml --- r: 137715 b: refs/heads/master c: f97d2074e364d51dde91d2a94a262466815d13ce h: refs/heads/master i: 137713: 402fe4f07272b17e850a25a484dbc9ac864898f8 137711: bcdf8b801af034d26a2da5930c9adb145a4d14ac v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ttpci/av7110_v4l.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2b30fd86afae..be33cc2023c3 100644 --- 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 index 04334058f8f8..2210cff738e6 100644 --- 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;