This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/media_tree.git tree:

Subject: [media] em28xx: Remove redundant dev->ctl_input set
Author:  Ezequiel García <[email protected]>
Date:    Fri Mar 23 18:09:34 2012 -0300

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 <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/video/em28xx/em28xx-video.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

---

http://git.linuxtv.org/media_tree.git?a=commitdiff;h=96371fc89b7f813a38739946eb7ea7c0a841fd86

diff --git a/drivers/media/video/em28xx/em28xx-video.c 
b/drivers/media/video/em28xx/em28xx-video.c
index 324b695..bcc4160 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)
        if (0 == INPUT(i)->type)
                return -EINVAL;
 
-       dev->ctl_input = i;
-
-       video_mux(dev, dev->ctl_input);
+       video_mux(dev, i);
        return 0;
 }
 
@@ -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];
@@ -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;

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to