commit ed985937f737bde6b40bd63f193bd7822eeb1d97
author Kevin Rocard <krocard@google.com> Wed Apr 19 01:05:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 01:05:17 2017 +0000
tree 3ec2fedc5eca23590bae923f6bebe41db888f9d8
parent c91c7c1f111c3899f896a413a4f8234db475b9f6
parent e46a28d3c7dad78a7874fe166e18c2882faf8b9b

Merge "Prevent leak of sndmonitor resources" into oc-dev
am: e46a28d3c7

Change-Id: Ia0e831cc93dd9099ac0e6c90ea95b85ae8eafdf1

hal/audio_extn/sndmonitor.c

diff --git a/hal/audio_extn/sndmonitor.c b/hal/audio_extn/sndmonitor.c
index d303c06..f4e208c 100644
--- a/hal/audio_extn/sndmonitor.c
+++ b/hal/audio_extn/sndmonitor.c
@@ -191,6 +191,7 @@
 
         ret = add_new_sndcard(atoi(ptr), fd);
         if (ret != 0)
+            close(fd);
             continue;
 
         num_cards++;
@@ -219,6 +220,7 @@
 
         ret = add_new_sndcard(CPE_MAGIC_NUM+num_cpe, fd);
         if (ret != 0)
+            close(fd);
             continue;
 
         num_cpe++;

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index db29122..76343f7 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -4053,6 +4053,7 @@
     if (!adev)
         return 0;
 
+    audio_extn_snd_mon_deinit();
     audio_extn_tfa_98xx_deinit();
 
     audio_extn_snd_mon_unregister_listener(adev);