[media] em28xx: Remove redundant dev->ctl_input set
authorEzequiel García <elezegarcia@gmail.com>
Fri, 23 Mar 2012 21:09:34 +0000 (18:09 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 10 Apr 2012 23:30:44 +0000 (20:30 -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 <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/em28xx/em28xx-video.c

index 324b695c07242b4cb04e338bd060d49b5f273b56..bcc41603c19310cf40ef2c217f3d40e526d51c8a 100644 (file)
@@ -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;