From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 6 Mar 2009 04:00:41 +0000 (-0800)
Subject: auto import from //depot/cupcake/@136745
X-Git-Tag: android-x86-1.6~15^2~2
X-Git-Url: http://git.sourceforge.jp/view?p=android-x86%2Fexternal-bluetooth-bluez.git;a=commitdiff_plain;h=b726fa21ff0e987142695f89147d942d87a4026e

auto import from //depot/cupcake/@136745
---

diff --git a/utils/audio/liba2dp.c b/utils/audio/liba2dp.c
index 25ebede8e..55627e34a 100644
--- a/utils/audio/liba2dp.c
+++ b/utils/audio/liba2dp.c
@@ -665,12 +665,7 @@ static int audioservice_recv(struct bluetooth_data *data,
 	int err;
 	const char *type;
 
-	VDBG("trying to receive msg from audio service...");
-	data->server.revents = 0;
-	err = poll(&data->server, 1, POLL_TIMEOUT);
-	VDBG("poll returned %d", ret);
-	if (err == 1)
-		err = recv(data->server.fd, inmsg, BT_AUDIO_IPC_PACKET_SIZE, 0);
+	err = recv(data->server.fd, inmsg, BT_AUDIO_IPC_PACKET_SIZE, 0);
 	if (err > 0) {
 		type = bt_audio_strmsg(inmsg->msg_type);
 		if (type) {
@@ -686,8 +681,8 @@ static int audioservice_recv(struct bluetooth_data *data,
 		err = -errno;
 		ERR("Error receiving data from audio service: %s(%d)",
 					strerror(errno), errno);
-		close(data->server.fd);
-		data->server.fd = -1;
+		if (err == -EPIPE)
+			bluetooth_close(data);
 	}
 
 	return err;