diff options
Diffstat (limited to 'plugins/mm-modem-sierra.c')
| -rw-r--r-- | plugins/mm-modem-sierra.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/mm-modem-sierra.c b/plugins/mm-modem-sierra.c index 69a7af30..e567a5da 100644 --- a/plugins/mm-modem-sierra.c +++ b/plugins/mm-modem-sierra.c @@ -128,11 +128,11 @@ enable (MMModem *modem, } } -/* user_data != NULL means the port is a secondary port */ static gboolean grab_port (MMModem *modem, const char *subsys, const char *name, + MMPortType suggested_type, gpointer user_data, GError **error) { @@ -140,13 +140,13 @@ grab_port (MMModem *modem, MMPortType ptype = MM_PORT_TYPE_IGNORED; MMPort *port; - if (user_data) { - if (!mm_generic_gsm_get_port (gsm, MM_PORT_TYPE_SECONDARY)) - ptype = MM_PORT_TYPE_SECONDARY; - } else { + if (suggested_type == MM_PORT_TYPE_UNKNOWN) { if (!mm_generic_gsm_get_port (gsm, MM_PORT_TYPE_PRIMARY)) ptype = MM_PORT_TYPE_PRIMARY; - } + else if (!mm_generic_gsm_get_port (gsm, MM_PORT_TYPE_SECONDARY)) + ptype = MM_PORT_TYPE_SECONDARY; + } else + ptype = suggested_type; port = mm_generic_gsm_grab_port (gsm, subsys, name, ptype, error); |