commit b6d76635160f3102b7c23eea5b81b3b15b126690
author Kevin Rocard <krocard@google.com> Wed Apr 19 01:11:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 19 01:11:28 2017 +0000
tree 65390dcd0f051943094a05bbb6973271957a92a4
parent be28c5ccb3bada7761707e2d2e363f2ce73a8bc0
parent ed985937f737bde6b40bd63f193bd7822eeb1d97

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

Change-Id: I9087eb73ab92e234b73ee634bc4cf1cf04874aac

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 08d5622..1f762e9 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -4054,6 +4054,7 @@
     if (!adev)
         return 0;
 
+    audio_extn_snd_mon_deinit();
     audio_extn_tfa_98xx_deinit();
 
     audio_extn_snd_mon_unregister_listener(adev);