From cc5fcd195a26b0b09be8e47d95e54a92f78c8806 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 6 Apr 2011 17:08:06 +0200 Subject: modem-base: allow NULL ports in get_card_info() if port_error given So that cached values can be returned if querying while the port is connected. --- src/mm-modem-base.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mm-modem-base.c b/src/mm-modem-base.c index ee5e1c86..9afc1bf9 100644 --- a/src/mm-modem-base.c +++ b/src/mm-modem-base.c @@ -526,12 +526,12 @@ mm_modem_base_get_card_info (MMModemBase *self, MMModemBasePrivate *priv; MMCallbackInfo *info; gboolean cached = FALSE; - GError *error = port_error; + GError *error = NULL; g_return_if_fail (self != NULL); g_return_if_fail (MM_IS_MODEM_BASE (self)); - g_return_if_fail (port != NULL); - g_return_if_fail (MM_IS_AT_SERIAL_PORT (port)); + /* Either we get a proper AT port, or we get a port_error */ + g_return_if_fail ((port != NULL && MM_IS_AT_SERIAL_PORT (port)) || port_error != NULL); g_return_if_fail (callback != NULL); priv = MM_MODEM_BASE_GET_PRIVATE (self); -- cgit v1.2.3-70-g09d2