aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap3isp
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-09-22 16:09:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:31:31 -0400
commited33ac8e0876a3016511ea0aaf9af1d965ee2c44 (patch)
treeb4b0c581a0ec831d3857d86205234b8924bd6ba5 /drivers/media/video/omap3isp
parent39099d09ae4605003696919d7c3a6e8a96607c4b (diff)
[media] omap3isp: Add missing mutex_destroy() calls
Mutexes must be destroyed with mutex_destroy(). Add missing calls in the modules cleanup handlers. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/omap3isp')
-rw-r--r--drivers/media/video/omap3isp/isp.c2
-rw-r--r--drivers/media/video/omap3isp/ispccdc.c2
-rw-r--r--drivers/media/video/omap3isp/ispstat.c1
-rw-r--r--drivers/media/video/omap3isp/ispvideo.c2
4 files changed, 7 insertions, 0 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 678e1252047a..c8f147ef320d 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -2210,6 +2210,8 @@ error:
2210 regulator_put(isp->isp_csiphy2.vdd); 2210 regulator_put(isp->isp_csiphy2.vdd);
2211 regulator_put(isp->isp_csiphy1.vdd); 2211 regulator_put(isp->isp_csiphy1.vdd);
2212 platform_set_drvdata(pdev, NULL); 2212 platform_set_drvdata(pdev, NULL);
2213
2214 mutex_destroy(&isp->isp_mutex);
2213 kfree(isp); 2215 kfree(isp);
2214 2216
2215 return ret; 2217 return ret;
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index c30cc59d7032..3a43be2f5452 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -2297,4 +2297,6 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
2297 2297
2298 if (ccdc->fpc.fpcaddr != 0) 2298 if (ccdc->fpc.fpcaddr != 0)
2299 omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr); 2299 omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
2300
2301 mutex_destroy(&ccdc->ioctl_lock);
2300} 2302}
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c
index b124326d1e7f..28b7cc61cba6 100644
--- a/drivers/media/video/omap3isp/ispstat.c
+++ b/drivers/media/video/omap3isp/ispstat.c
@@ -1087,6 +1087,7 @@ int omap3isp_stat_init(struct ispstat *stat, const char *name,
1087void omap3isp_stat_cleanup(struct ispstat *stat) 1087void omap3isp_stat_cleanup(struct ispstat *stat)
1088{ 1088{
1089 media_entity_cleanup(&stat->subdev.entity); 1089 media_entity_cleanup(&stat->subdev.entity);
1090 mutex_destroy(&stat->ioctl_lock);
1090 isp_stat_bufs_free(stat); 1091 isp_stat_bufs_free(stat);
1091 kfree(stat->buf); 1092 kfree(stat->buf);
1092} 1093}
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index 7d74ebbdb63b..d1000723c5ae 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -1328,6 +1328,8 @@ int omap3isp_video_init(struct isp_video *video, const char *name)
1328void omap3isp_video_cleanup(struct isp_video *video) 1328void omap3isp_video_cleanup(struct isp_video *video)
1329{ 1329{
1330 media_entity_cleanup(&video->video.entity); 1330 media_entity_cleanup(&video->video.entity);
1331 mutex_destroy(&video->stream_lock);
1332 mutex_destroy(&video->mutex);
1331} 1333}
1332 1334
1333int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev) 1335int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev)