colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-modem: when getting best AT port, assume we may have lost specific ports

Browse Source 
Don't assume that primary port is always set.
This commit is contained in:
Aleksander Morgado
2012-03-07 17:07:36 +01:00
parent c24012ef1b
commit 4bdfd25de1
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mm-base-modem.c
View File

@@ -365,22 +365,21 @@ mm_base_modem_get_best_at_port (MMBaseModem *self,
/* Decide which port to use */ /* Decide which port to use */
port = mm_base_modem_get_port_primary (self); port = mm_base_modem_get_port_primary (self);
g_assert (port); if (port && !mm_port_get_connected (MM_PORT (port)))
if (mm_port_get_connected (MM_PORT (port))) { return port;
/* If primary port is connected, check if we can get the secondary
* port */
port = mm_base_modem_get_port_secondary (self);
if (!port) {
/* If we don't have a secondary port, we need to halt the AT
* operation */
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_CONNECTED,
"No port available to run command");
}
}
return port; /* If primary port is connected, check if we can get the secondary
* port */
port = mm_base_modem_get_port_secondary (self);
if (port && !mm_port_get_connected (MM_PORT (port)))
return port;
/* Otherwise, we cannot get any port */
g_set_error (error,
MM_CORE_ERROR,
MM_CORE_ERROR_CONNECTED,
"No port available to run command");
return NULL;
} }
static void static void