shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera:videobuf free invalidatemporary for voip

Browse Source
This commit is contained in:
ddl
2011-01-01 21:38:08 +08:00
parent 4babcfde8b
commit 9c06dbb99a
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/video/rk29_camera_oneframe.c
View File

@@ -760,10 +760,14 @@ static void rk29_camera_remove_device(struct soc_camera_device *icd)
rk29_camera_deactivate(pcdev);
/* ddl@rock-chips.com: Call videobuf_mmap_free here for free the struct video_buffer which malloc in videobuf_alloc */
#if 0
if (pcdev->vb_vidq_ptr) {
videobuf_mmap_free(pcdev->vb_vidq_ptr);
pcdev->vb_vidq_ptr = NULL;
}
#else
pcdev->vb_vidq_ptr = NULL;
#endif
if (pcdev->camera_work) {
kfree(pcdev->camera_work);
@@ -1436,6 +1440,10 @@ static int rk29_camera_probe(struct platform_device *pdev)
exit_free_irq:
free_irq(pcdev->irq, pcdev);
if (pcdev->camera_wq) {
destroy_workqueue(pcdev->camera_wq);
pcdev->camera_wq = NULL;
}
exit_reqirq:
iounmap(pcdev->base);
exit_ioremap:
@@ -1491,6 +1499,11 @@ static int __devexit rk29_camera_remove(struct platform_device *pdev)
free_irq(pcdev->irq, pcdev);
if (pcdev->camera_wq) {
destroy_workqueue(pcdev->camera_wq);
pcdev->camera_wq = NULL;
}
soc_camera_host_unregister(&pcdev->soc_host);
res = pcdev->res;