Skip to content

Commit

Permalink
V4L/DVB (10815): bttv: Don't need to zero ioctl parameter fields
Browse files Browse the repository at this point in the history
The v4l2 core code in v4l2_ioctl will zero out the structure the driver is
supposed to fill in for read-only ioctls.  For read/write ioctls, all the
fields which aren't supplied from userspace will be zeroed out.

Zeroing code is removed from enum_input and g_tuner.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Trent Piepho authored and Mauro Carvalho Chehab committed Mar 30, 2009
1 parent 717167e commit 522a5f1
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions drivers/media/video/bt8xx/bttv-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1894,16 +1894,11 @@ static int bttv_enum_input(struct file *file, void *priv,
{
struct bttv_fh *fh = priv;
struct bttv *btv = fh->btv;
unsigned int n;
int n;

n = i->index;

if (n >= bttv_tvcards[btv->c.type].video_inputs)
if (i->index >= bttv_tvcards[btv->c.type].video_inputs)
return -EINVAL;

memset(i, 0, sizeof(*i));

i->index = n;
i->type = V4L2_INPUT_TYPE_CAMERA;
i->audioset = 1;

Expand Down Expand Up @@ -2952,7 +2947,6 @@ static int bttv_g_tuner(struct file *file, void *priv,
return -EINVAL;

mutex_lock(&btv->lock);
memset(t, 0, sizeof(*t));
t->rxsubchans = V4L2_TUNER_SUB_MONO;
bttv_call_i2c_clients(btv, VIDIOC_G_TUNER, t);
strcpy(t->name, "Television");
Expand Down Expand Up @@ -3495,7 +3489,6 @@ static int radio_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
if (0 != t->index)
return -EINVAL;
mutex_lock(&btv->lock);
memset(t, 0, sizeof(*t));
strcpy(t->name, "Radio");
t->type = V4L2_TUNER_RADIO;

Expand Down

0 comments on commit 522a5f1

Please sign in to comment.