Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-15 07:33:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Frank Schaefer 2014-01-12 13:24:22 -03:00 committed by Mauro Carvalho Chehab
parent 25dd165233
commit f188da4395
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/usb/em28xx/em28xx-video.c
View File

@ -1929,8 +1929,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;
}
@ -1957,8 +1960,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;
}