diff options
Diffstat (limited to 'drivers/media/video/omap3isp/ispcsi2.c')
-rw-r--r-- | drivers/media/video/omap3isp/ispcsi2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/omap3isp/ispcsi2.c b/drivers/media/video/omap3isp/ispcsi2.c index 69161a682b3..5612e95ac0b 100644 --- a/drivers/media/video/omap3isp/ispcsi2.c +++ b/drivers/media/video/omap3isp/ispcsi2.c | |||
@@ -1241,8 +1241,6 @@ static int csi2_init_entities(struct isp_csi2_device *csi2) | |||
1241 | 1241 | ||
1242 | void omap3isp_csi2_unregister_entities(struct isp_csi2_device *csi2) | 1242 | void omap3isp_csi2_unregister_entities(struct isp_csi2_device *csi2) |
1243 | { | 1243 | { |
1244 | media_entity_cleanup(&csi2->subdev.entity); | ||
1245 | |||
1246 | v4l2_device_unregister_subdev(&csi2->subdev); | 1244 | v4l2_device_unregister_subdev(&csi2->subdev); |
1247 | omap3isp_video_unregister(&csi2->video_out); | 1245 | omap3isp_video_unregister(&csi2->video_out); |
1248 | } | 1246 | } |
@@ -1277,6 +1275,10 @@ error: | |||
1277 | */ | 1275 | */ |
1278 | void omap3isp_csi2_cleanup(struct isp_device *isp) | 1276 | void omap3isp_csi2_cleanup(struct isp_device *isp) |
1279 | { | 1277 | { |
1278 | struct isp_csi2_device *csi2a = &isp->isp_csi2a; | ||
1279 | |||
1280 | omap3isp_video_cleanup(&csi2a->video_out); | ||
1281 | media_entity_cleanup(&csi2a->subdev.entity); | ||
1280 | } | 1282 | } |
1281 | 1283 | ||
1282 | /* | 1284 | /* |