Commit ed33ac8e authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

[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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 39099d09
...@@ -2210,6 +2210,8 @@ static int isp_probe(struct platform_device *pdev) ...@@ -2210,6 +2210,8 @@ static int isp_probe(struct platform_device *pdev)
regulator_put(isp->isp_csiphy2.vdd); regulator_put(isp->isp_csiphy2.vdd);
regulator_put(isp->isp_csiphy1.vdd); regulator_put(isp->isp_csiphy1.vdd);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
mutex_destroy(&isp->isp_mutex);
kfree(isp); kfree(isp);
return ret; return ret;
......
...@@ -2297,4 +2297,6 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp) ...@@ -2297,4 +2297,6 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
if (ccdc->fpc.fpcaddr != 0) if (ccdc->fpc.fpcaddr != 0)
omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr); omap_iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
mutex_destroy(&ccdc->ioctl_lock);
} }
...@@ -1087,6 +1087,7 @@ int omap3isp_stat_init(struct ispstat *stat, const char *name, ...@@ -1087,6 +1087,7 @@ int omap3isp_stat_init(struct ispstat *stat, const char *name,
void omap3isp_stat_cleanup(struct ispstat *stat) void omap3isp_stat_cleanup(struct ispstat *stat)
{ {
media_entity_cleanup(&stat->subdev.entity); media_entity_cleanup(&stat->subdev.entity);
mutex_destroy(&stat->ioctl_lock);
isp_stat_bufs_free(stat); isp_stat_bufs_free(stat);
kfree(stat->buf); kfree(stat->buf);
} }
...@@ -1328,6 +1328,8 @@ int omap3isp_video_init(struct isp_video *video, const char *name) ...@@ -1328,6 +1328,8 @@ int omap3isp_video_init(struct isp_video *video, const char *name)
void omap3isp_video_cleanup(struct isp_video *video) void omap3isp_video_cleanup(struct isp_video *video)
{ {
media_entity_cleanup(&video->video.entity); media_entity_cleanup(&video->video.entity);
mutex_destroy(&video->stream_lock);
mutex_destroy(&video->mutex);
} }
int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev) int omap3isp_video_register(struct isp_video *video, struct v4l2_device *vdev)
......
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