[PORT FROM R2] atomisp: clean up media entities at exit

BZ: 17272

There are two places where we have memory leaks (found by kmemleak). This
change eliminates both of them.

Change-Id: If61ca8f85caf7a77407417f747ce0c781253caea
Orig-Change-Id: I8eb84e5261b2790561aca774681f77dddd2e7697
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: David Cohen <david.a.cohen@intel.com>
Reviewed-on: http://android.intel.com:8080/25442
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Koskinen, Ilkka <ilkka.koskinen@intel.com>
Reviewed-by: Kruger, Jozef <jozef.kruger@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Reviewed-on: http://android.intel.com:8080/28033
Reviewed-by: Tuominen, TeemuX <teemux.tuominen@intel.com>
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>

diff --git a/drivers/media/video/atomisp/atomisp_file.c b/drivers/media/video/atomisp/atomisp_file.c
index f34026f..7f65620 100644 (file)
--- a/drivers/media/video/atomisp/atomisp_file.c
+++ b/drivers/media/video/atomisp/atomisp_file.c
@@ -304,6 +304,7 @@ static const struct media_entity_operations file_input_entity_ops = {
 void
 atomisp_file_input_unregister_entities(struct atomisp_file_device *file_dev)
 {
+       media_entity_cleanup(&file_dev->sd.entity);
        v4l2_device_unregister_subdev(&file_dev->sd);
 }
 

diff --git a/drivers/media/video/atomisp/atomisp_tpg.c b/drivers/media/video/atomisp/atomisp_tpg.c
index 130a8e5..e5aeda8 100644 (file)
--- a/drivers/media/video/atomisp/atomisp_tpg.c
+++ b/drivers/media/video/atomisp/atomisp_tpg.c
@@ -225,6 +225,7 @@ static const struct media_entity_operations tpg_entity_ops = {
 
 void atomisp_tpg_unregister_entities(struct atomisp_tpg_device *tpg)
 {
+       media_entity_cleanup(&tpg->sd.entity);
        v4l2_device_unregister_subdev(&tpg->sd);
 }