openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] em28xx: move v4l2_device_disconnect() call from the core to the v4l extension 

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:21 -03:00 committed by Mauro Carvalho Chehab
parent 23e8642cc4
commit 5ad10de6ff
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/usb/em28xx/em28xx-cards.c
View File

@ -3387,16 +3387,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
flush_request_modules(dev);
mutex_lock(&dev->lock);
v4l2_device_disconnect(&dev->v4l2_dev);
if (dev->users)
em28xx_warn("device %s is open! Deregistration and memory deallocation are deferred on close.\n",
video_device_node_name(dev->vdev));
mutex_unlock(&dev->lock);
em28xx_close_extension(dev);
/* NOTE: must be called BEFORE the resources are released */

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

@ -1893,6 +1893,8 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
return 0;
}
v4l2_device_disconnect(&dev->v4l2_dev);
em28xx_uninit_usb_xfer(dev, EM28XX_ANALOG_MODE);
if (dev->radio_dev) {
@ -1921,6 +1923,9 @@ static int em28xx_v4l2_fini(struct em28xx *dev)
dev->vdev = NULL;
}
if (dev->users)
em28xx_warn("Device is open ! Deregistration and memory deallocation are deferred on close.\n");
return 0;
}