From 2ed135a67acf953cc303938748eaf84fe0f6eda0 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Fri, 18 Jul 2014 12:48:17 +0300 Subject: [PATCH] android/hal-audio: Fix leaving open socket When getting out of the poll loop we shall close socket always. --- android/hal-audio.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 */ -- 2.47.3