Commit 96371fc8 authored by Ezequiel García's avatar Ezequiel García Committed by Mauro Carvalho Chehab

[media] em28xx: Remove redundant dev->ctl_input set

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: default avatarEzequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 38ed1aef
...@@ -1305,9 +1305,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) ...@@ -1305,9 +1305,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
if (0 == INPUT(i)->type) if (0 == INPUT(i)->type)
return -EINVAL; return -EINVAL;
dev->ctl_input = i; video_mux(dev, i);
video_mux(dev, dev->ctl_input);
return 0; return 0;
} }
...@@ -2518,7 +2516,6 @@ int em28xx_register_analog_devices(struct em28xx *dev) ...@@ -2518,7 +2516,6 @@ int em28xx_register_analog_devices(struct em28xx *dev)
dev->norm = em28xx_video_template.current_norm; dev->norm = em28xx_video_template.current_norm;
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm); v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm);
dev->interlaced = EM28XX_INTERLACED_DEFAULT; dev->interlaced = EM28XX_INTERLACED_DEFAULT;
dev->ctl_input = 0;
/* Analog specific initialization */ /* Analog specific initialization */
dev->format = &format[0]; dev->format = &format[0];
...@@ -2532,7 +2529,7 @@ int em28xx_register_analog_devices(struct em28xx *dev) ...@@ -2532,7 +2529,7 @@ int em28xx_register_analog_devices(struct em28xx *dev)
em28xx_set_video_format(dev, format[0].fourcc, em28xx_set_video_format(dev, format[0].fourcc,
maxw, norm_maxh(dev)); maxw, norm_maxh(dev));
video_mux(dev, dev->ctl_input); video_mux(dev, 0);
/* Audio defaults */ /* Audio defaults */
dev->mute = 1; dev->mute = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment