From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Fri, 18 Jul 2014 09:48:17 +0000 (+0300)
Subject: android/hal-audio: Fix leaving open socket
X-Git-Tag: android-x86-4.4-r3~3124
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2ed135a67acf953cc303938748eaf84fe0f6eda0;p=android-x86%2Fexternal-bluetooth-bluez.git

android/hal-audio: Fix leaving open socket

When getting out of the poll loop we shall close socket always.
---

diff --git a/android/hal-audio.c b/android/hal-audio.c
index 1a3d3ae4e..d7a06fa66 100644
--- a/android/hal-audio.c
+++ b/android/hal-audio.c
@@ -1377,14 +1377,12 @@ static void *ipc_handler(void *data)
 		/* Check if socket is still alive. Empty while loop.*/
 		while (poll(&pfd, 1, -1) < 0 && errno == EINTR);
 
-		if (pfd.revents & (POLLHUP | POLLERR | POLLNVAL)) {
-			info("Audio HAL: Socket closed");
+		info("Audio HAL: Socket closed");
 
-			pthread_mutex_lock(&sk_mutex);
-			close(audio_sk);
-			audio_sk = -1;
-			pthread_mutex_unlock(&sk_mutex);
-		}
+		pthread_mutex_lock(&sk_mutex);
+		close(audio_sk);
+		audio_sk = -1;
+		pthread_mutex_unlock(&sk_mutex);
 	}
 
 	/* audio_sk is closed at this point, just cleanup endpoints states */