From: Zhu Yanhai <yanhai.zhu@linux.intel.com>
To: linux-bluetooth@vger.kernel.org
Cc: Zhu Yanhai <yanhai.zhu@linux.intel.com>
Subject: [PATCH] Don't pass down NULL path to dbus if no modem.
Date: Tue, 12 Jan 2010 14:15:35 +0800 [thread overview]
Message-ID: <1263276935-7456-1-git-send-email-yanhai.zhu@linux.intel.com> (raw)
We shouldn't pass down NULL object path to dbus if there's no modems,
which is a common case on many netbooks.
Signed-off-by: Zhu Yanhai <yanhai.zhu@linux.intel.com>
---
audio/telephony-ofono.c | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/audio/telephony-ofono.c b/audio/telephony-ofono.c
index 2778cfc..4f4bf88 100644
--- a/audio/telephony-ofono.c
+++ b/audio/telephony-ofono.c
@@ -574,12 +574,20 @@ static void list_modem_reply(DBusPendingCall *call, void *user_data)
while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) {
dbus_message_iter_get_basic(&sub, &modem_obj_path_local);
+ if (modem_obj_path_local == NULL)
+ continue;
+
modem_obj_path = g_strdup(modem_obj_path_local);
- debug("modem_obj_path is %p, %s\n", modem_obj_path,
+ debug("modem_obj_path is %p, %s", modem_obj_path,
modem_obj_path);
dbus_message_iter_next(&sub);
}
+ if (modem_obj_path == NULL) {
+ debug("no modem found.");
+ goto done;
+ }
+
ret = get_registration_and_signal_status();
if (ret < 0)
error("get_registration_and_signal_status() failed(%d)", ret);
--
1.6.2.2
next reply other threads:[~2010-01-12 6:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-12 6:15 Zhu Yanhai [this message]
2010-01-12 6:25 ` [PATCH] Don't pass down NULL path to dbus if no modem Zhu Yanhai
2010-01-13 6:28 ` Johan Hedberg
2010-01-13 6:52 ` Zhu Yanhai
2010-01-13 7:35 ` Johan Hedberg
2010-01-13 7:46 ` Zhu Yanhai
-- strict thread matches above, loose matches on Subject: below --
2010-01-11 7:36 Zhu Yanhai
2010-01-11 13:53 ` Johan Hedberg
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=1263276935-7456-1-git-send-email-yanhai.zhu@linux.intel.com \
--to=yanhai.zhu@linux.intel.com \
--cc=linux-bluetooth@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).