diff options
author | Ezequiel GarcĂa <elezegarcia@gmail.com> | 2012-03-23 17:09:34 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-10 19:30:44 -0400 |
commit | 96371fc89b7f813a38739946eb7ea7c0a841fd86 (patch) | |
tree | c3fbaa3c23f930c54ef33e6cb1520d557a7f64d8 /drivers/media/video/em28xx/em28xx-video.c | |
parent | 38ed1aef92ab4ba1a3881940ce3e8b680dddf50a (diff) |
[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: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 324b695c0724..bcc41603c193 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -1305,9 +1305,7 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) | |||
1305 | if (0 == INPUT(i)->type) | 1305 | if (0 == INPUT(i)->type) |
1306 | return -EINVAL; | 1306 | return -EINVAL; |
1307 | 1307 | ||
1308 | dev->ctl_input = i; | 1308 | video_mux(dev, i); |
1309 | |||
1310 | video_mux(dev, dev->ctl_input); | ||
1311 | return 0; | 1309 | return 0; |
1312 | } | 1310 | } |
1313 | 1311 | ||
@@ -2518,7 +2516,6 @@ int em28xx_register_analog_devices(struct em28xx *dev) | |||
2518 | dev->norm = em28xx_video_template.current_norm; | 2516 | dev->norm = em28xx_video_template.current_norm; |
2519 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm); | 2517 | v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_std, dev->norm); |
2520 | dev->interlaced = EM28XX_INTERLACED_DEFAULT; | 2518 | dev->interlaced = EM28XX_INTERLACED_DEFAULT; |
2521 | dev->ctl_input = 0; | ||
2522 | 2519 | ||
2523 | /* Analog specific initialization */ | 2520 | /* Analog specific initialization */ |
2524 | dev->format = &format[0]; | 2521 | dev->format = &format[0]; |
@@ -2532,7 +2529,7 @@ int em28xx_register_analog_devices(struct em28xx *dev) | |||
2532 | em28xx_set_video_format(dev, format[0].fourcc, | 2529 | em28xx_set_video_format(dev, format[0].fourcc, |
2533 | maxw, norm_maxh(dev)); | 2530 | maxw, norm_maxh(dev)); |
2534 | 2531 | ||
2535 | video_mux(dev, dev->ctl_input); | 2532 | video_mux(dev, 0); |
2536 | 2533 | ||
2537 | /* Audio defaults */ | 2534 | /* Audio defaults */ |
2538 | dev->mute = 1; | 2535 | dev->mute = 1; |