diff options
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.c')
-rw-r--r-- | drivers/media/video/omap3isp/ispccdc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c index 253fdcce2df..98804d5f89c 100644 --- a/drivers/media/video/omap3isp/ispccdc.c +++ b/drivers/media/video/omap3isp/ispccdc.c | |||
@@ -2206,8 +2206,6 @@ static int ccdc_init_entities(struct isp_ccdc_device *ccdc) | |||
2206 | 2206 | ||
2207 | void omap3isp_ccdc_unregister_entities(struct isp_ccdc_device *ccdc) | 2207 | void omap3isp_ccdc_unregister_entities(struct isp_ccdc_device *ccdc) |
2208 | { | 2208 | { |
2209 | media_entity_cleanup(&ccdc->subdev.entity); | ||
2210 | |||
2211 | v4l2_device_unregister_subdev(&ccdc->subdev); | 2209 | v4l2_device_unregister_subdev(&ccdc->subdev); |
2212 | omap3isp_video_unregister(&ccdc->video_out); | 2210 | omap3isp_video_unregister(&ccdc->video_out); |
2213 | } | 2211 | } |
@@ -2287,6 +2285,9 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp) | |||
2287 | { | 2285 | { |
2288 | struct isp_ccdc_device *ccdc = &isp->isp_ccdc; | 2286 | struct isp_ccdc_device *ccdc = &isp->isp_ccdc; |
2289 | 2287 | ||
2288 | omap3isp_video_cleanup(&ccdc->video_out); | ||
2289 | media_entity_cleanup(&ccdc->subdev.entity); | ||
2290 | |||
2290 | /* Free LSC requests. As the CCDC is stopped there's no active request, | 2291 | /* Free LSC requests. As the CCDC is stopped there's no active request, |
2291 | * so only the pending request and the free queue need to be handled. | 2292 | * so only the pending request and the free queue need to be handled. |
2292 | */ | 2293 | */ |