From: Szymon Janc <szymon.janc@tieto.com>
Date: Wed, 12 Dec 2012 10:28:08 +0000 (+0100)
Subject: avctp: Remove double looking for audio device
X-Git-Tag: android-x86-4.4-r3~9481
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d350a5cefe6dda34c082c6a7ba43a35294ac5391;p=android-x86%2Fexternal-bluetooth-bluez.git

avctp: Remove double looking for audio device

There is no need to double call for manager_get_audio_device with
toggled create flag. manager_get_audio_device with create set to true
will only create new audio device if matching one was not found.
---

diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index 8ffbf43da..013c587ab 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -1132,14 +1132,10 @@ static void avctp_confirm_cb(GIOChannel *chan, gpointer data)
 	if (session == NULL)
 		return;
 
-	dev = manager_get_audio_device(device, FALSE);
+	dev = manager_get_audio_device(device, TRUE);
 	if (!dev) {
-		dev = manager_get_audio_device(device, TRUE);
-		if (!dev) {
-			error("Unable to get audio device object for %s",
-					address);
-			goto drop;
-		}
+		error("Unable to get audio device object for %s", address);
+		goto drop;
 	}
 
 	if (dev->control == NULL) {