From ca3ae87d0ae284bb1f20a21f5a3fe739d28cada0 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 10 Apr 2014 09:36:11 -0500 Subject: handsfree: Reflow logic --- src/handsfree.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/handsfree.c') diff --git a/src/handsfree.c b/src/handsfree.c index 86ca46c3..8a0037fe 100644 --- a/src/handsfree.c +++ b/src/handsfree.c @@ -298,17 +298,18 @@ out: static void query_cnum(struct ofono_handsfree *hf) { - if (hf->driver->cnum_query == NULL) { - if (hf->pending) { - DBusMessage *reply = - generate_get_properties_reply(hf, hf->pending); - __ofono_dbus_pending_reply(&hf->pending, reply); - } + DBusMessage *reply; + if (hf->driver->cnum_query != NULL) { + hf->driver->cnum_query(hf, hf_cnum_callback, hf); return; } - hf->driver->cnum_query(hf, hf_cnum_callback, hf); + if (hf->pending == NULL) + return; + + reply = generate_get_properties_reply(hf, hf->pending); + __ofono_dbus_pending_reply(&hf->pending, reply); } static DBusMessage *handsfree_get_properties(DBusConnection *conn, -- cgit v1.2.3