From: =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis <frederic.danis@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH] bluetooth: remove unneeded g_io_channel_shutdown
Date: Thu, 17 Feb 2011 17:52:57 +0100 [thread overview]
Message-ID: <1297961577-9130-1-git-send-email-frederic.danis@linux.intel.com> (raw)
[-- 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
next reply other threads:[~2011-02-17 16:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-17 16:52 =?unknown-8bit?q?Fr=C3=A9d=C3=A9ric?= Danis [this message]
2011-02-17 17:16 ` [PATCH] bluetooth: remove unneeded g_io_channel_shutdown Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297961577-9130-1-git-send-email-frederic.danis@linux.intel.com \
--to=frederic.danis@linux.intel.com \
--cc=ofono@ofono.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.