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

base-modem: don't assume primary AT port is available

Browse Source 
QMI modems may not have it.
This commit is contained in:
Aleksander Morgado
2013-04-06 22:44:00 +02:00
parent 3b6b049e51
commit 358fe7f906
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -998,7 +998,8 @@ mm_base_modem_organize_ports (MMBaseModem *self,
if (MM_IS_AT_SERIAL_PORT (data_primary)) if (MM_IS_AT_SERIAL_PORT (data_primary))
mm_at_serial_port_set_flags (MM_AT_SERIAL_PORT (data_primary), MM_AT_PORT_FLAG_NONE); mm_at_serial_port_set_flags (MM_AT_SERIAL_PORT (data_primary), MM_AT_PORT_FLAG_NONE);
mm_at_serial_port_set_flags (primary, MM_AT_PORT_FLAG_PRIMARY); if (primary)
mm_at_serial_port_set_flags (primary, MM_AT_PORT_FLAG_PRIMARY);
if (secondary) if (secondary)
mm_at_serial_port_set_flags (secondary, MM_AT_PORT_FLAG_SECONDARY); mm_at_serial_port_set_flags (secondary, MM_AT_PORT_FLAG_SECONDARY);
@@ -1022,7 +1023,7 @@ mm_base_modem_organize_ports (MMBaseModem *self,
#endif #endif
/* We keep new refs to the objects here */ /* We keep new refs to the objects here */
self->priv->primary = g_object_ref (primary); self->priv->primary = (primary ? g_object_ref (primary) : NULL);
self->priv->secondary = (secondary ? g_object_ref (secondary) : NULL); self->priv->secondary = (secondary ? g_object_ref (secondary) : NULL);
self->priv->qcdm = (qcdm ? g_object_ref (qcdm) : NULL); self->priv->qcdm = (qcdm ? g_object_ref (qcdm) : NULL);
self->priv->gps_control = (gps_control ? g_object_ref (gps_control) : NULL); self->priv->gps_control = (gps_control ? g_object_ref (gps_control) : NULL);