1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 324b695c0724..50f5f4fc2148 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;
 }
 
@@ -2262,6 +2260,7 @@ static int em28xx_v4l2_close(struct file *filp)
                         em28xx_release_resources(dev);
                         kfree(dev->alt_max_pkt_size);
                         kfree(dev);
+                        kfree(fh);
                         return 0;
                 }
 
@@ -2286,7 +2285,6 @@ static int em28xx_v4l2_close(struct file *filp)
         videobuf_mmap_free(&fh->vb_vbiq);
         kfree(fh);
         dev->users--;
-        wake_up_interruptible_nr(&dev->open, 1);
         return 0;
 }
 
@@ -2497,6 +2495,10 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
         vfd->release    = video_device_release;
         vfd->debug      = video_debug;
         vfd->lock       = &dev->lock;
+        /* Locking in file operations other than ioctl should be done
+           by the driver, not the V4L2 core.
+           This driver needs auditing so that this flag can be removed. */
+        set_bit(V4L2_FL_LOCK_ALL_FOPS, &vfd->flags);
 
         snprintf(vfd->name, sizeof(vfd->name), "%s %s",
                  dev->name, type_name);
@@ -2518,7 +2520,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 +2533,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;