upstream: [media] em28xx-v4l: move v4l2_ctrl_handler freeing and v4l2_device unregist...

v4l2_ctrl_handler_free() and v4l2_device_unregister() are currently only called
when the last user closes the device and the device is already disconnected.
But that's wrong, we need to call these functions whenever the em28xx-v4l
extension is closed and we can already do this if the device is still opened
by some users.

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index ac9b394..e48e1eb 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1931,8 +1931,11 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
                dev->clk = NULL;
        }
 
+       v4l2_ctrl_handler_free(&dev->ctrl_handler);
+       v4l2_device_unregister(&dev->v4l2_dev);
+
        if (dev->users)
-               em28xx_warn("Device is open ! Deregistration and memory deallocation are deferred on close.\n");
+               em28xx_warn("Device is open ! Memory deallocation is deferred on last close.\n");
 
        return 0;
 }
@@ -1985,8 +1988,6 @@ static int em28xx_v4l2_close(struct file *filp)
 
                if (dev->disconnected) {
                        em28xx_release_resources(dev);
-                       v4l2_ctrl_handler_free(&dev->ctrl_handler);
-                       v4l2_device_unregister(&dev->v4l2_dev);
                        kfree(dev->alt_max_pkt_size_isoc);
                        goto exit;
                }