Commit f188da43 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab

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

[media] em28xx-v4l: move v4l2_ctrl_handler freeing and v4l2_device unregistration to em28xx_v4l2_fini

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: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 25dd1652
...@@ -1929,8 +1929,11 @@ static int em28xx_v4l2_fini(struct em28xx *dev) ...@@ -1929,8 +1929,11 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
dev->clk = NULL; dev->clk = NULL;
} }
v4l2_ctrl_handler_free(&dev->ctrl_handler);
v4l2_device_unregister(&dev->v4l2_dev);
if (dev->users) 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; return 0;
} }
...@@ -1957,8 +1960,6 @@ static int em28xx_v4l2_close(struct file *filp) ...@@ -1957,8 +1960,6 @@ static int em28xx_v4l2_close(struct file *filp)
if (dev->disconnected) { if (dev->disconnected) {
em28xx_release_resources(dev); em28xx_release_resources(dev);
v4l2_ctrl_handler_free(&dev->ctrl_handler);
v4l2_device_unregister(&dev->v4l2_dev);
kfree(dev->alt_max_pkt_size_isoc); kfree(dev->alt_max_pkt_size_isoc);
goto exit; goto exit;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment