diff options
author | Denis Kenzior <denkenz@gmail.com> | 2014-04-10 09:36:11 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2014-04-10 09:43:44 -0500 |
commit | ca3ae87d0ae284bb1f20a21f5a3fe739d28cada0 (patch) | |
tree | fee81a042e5999dee72d7e62bb55b25d96c3da08 /src | |
parent | 02138901d302547c5b9e77beb7dec274b04eecb0 (diff) | |
download | ofono-ca3ae87d0ae284bb1f20a21f5a3fe739d28cada0.tar.bz2 |
handsfree: Reflow logic
Diffstat (limited to 'src')
-rw-r--r-- | src/handsfree.c | 15 |
1 files changed, 8 insertions, 7 deletions
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, |