Skip to content

Commit

Permalink
[media] em28xx: Remove redundant dev->ctl_input set
Browse files Browse the repository at this point in the history
dev->ctl_input() is always set before a call to video_mux(),
but then video_mux() sets it again with the same value.

Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Ezequiel García authored and Mauro Carvalho Chehab committed Apr 10, 2012
1 parent 38ed1ae commit 96371fc
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/media/video/em28xx/em28xx-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1305,9 +1305,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
if (0 == INPUT(i)->type)
return -EINVAL;

dev->ctl_input = i;

video_mux(dev, dev->ctl_input);
video_mux(dev, i);
return 0;
}

Expand Down Expand Up @@ -2518,7 +2516,6 @@ int em28xx_register_analog_devices(struct em28xx *dev)
dev->norm = em28xx_video_template.current_norm;
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm);
dev->interlaced = EM28XX_INTERLACED_DEFAULT;
dev->ctl_input = 0;

/* Analog specific initialization */
dev->format = &format[0];
Expand All @@ -2532,7 +2529,7 @@ int em28xx_register_analog_devices(struct em28xx *dev)
em28xx_set_video_format(dev, format[0].fourcc,
maxw, norm_maxh(dev));

video_mux(dev, dev->ctl_input);
video_mux(dev, 0);

/* Audio defaults */
dev->mute = 1;
Expand Down

0 comments on commit 96371fc

Please sign in to comment.