[PATCH] bluetooth: remove unneeded g_io_channel_shutdown

[PATCH] bluetooth: remove unneeded g_io_channel_shutdown

[=?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis]

[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]

---
 plugins/hfp_ag.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/plugins/hfp_ag.c b/plugins/hfp_ag.c
index 6acb4dd..6edd73d 100644
--- a/plugins/hfp_ag.c
+++ b/plugins/hfp_ag.c
@@ -95,19 +95,19 @@ static void hfp_ag_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
 
 	if (err) {
 		DBG("%s", err->message);
-		goto failed;
+		return;
 	}
 
 	/* Pick the first voicecall capable modem */
 	modem = modems->data;
 	if (modem == NULL)
-		goto failed;
+		return;
 
 	DBG("Picked modem %p for emulator", modem);
 
 	em = ofono_emulator_create(modem, OFONO_EMULATOR_TYPE_HFP);
 	if (em == NULL)
-		goto failed;
+		return;
 
 	fd = g_io_channel_unix_get_fd(io);
 	ofono_emulator_register(em, fd);
@@ -115,9 +115,6 @@ static void hfp_ag_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
 	g_io_channel_set_close_on_unref(io, FALSE);
 
 	return;
-
-failed:
-	g_io_channel_shutdown(io, TRUE, NULL);
 }
 
 static void voicecall_watch(struct ofono_atom *atom,
-- 
1.7.1

Re: [PATCH] bluetooth: remove unneeded g_io_channel_shutdown

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

Hi Frédéric,

On 02/17/2011 10:52 AM, Frédéric Danis wrote:
> ---
>  plugins/hfp_ag.c |    9 +++------
>  1 files changed, 3 insertions(+), 6 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis