aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/usb/em28xx/em28xx-video.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index c3c928937dcd..09e18da0b5cd 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1918,14 +1918,14 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
1918 video_unregister_device(dev->vdev); 1918 video_unregister_device(dev->vdev);
1919 } 1919 }
1920 1920
1921 v4l2_ctrl_handler_free(&dev->ctrl_handler);
1922 v4l2_device_unregister(&dev->v4l2_dev);
1923
1921 if (dev->clk) { 1924 if (dev->clk) {
1922 v4l2_clk_unregister_fixed(dev->clk); 1925 v4l2_clk_unregister_fixed(dev->clk);
1923 dev->clk = NULL; 1926 dev->clk = NULL;
1924 } 1927 }
1925 1928
1926 v4l2_ctrl_handler_free(&dev->ctrl_handler);
1927 v4l2_device_unregister(&dev->v4l2_dev);
1928
1929 if (dev->users) 1929 if (dev->users)
1930 em28xx_warn("Device is open ! Memory deallocation is deferred on last close.\n"); 1930 em28xx_warn("Device is open ! Memory deallocation is deferred on last close.\n");
1931 mutex_unlock(&dev->lock); 1931 mutex_unlock(&dev->lock);