diff options
| -rw-r--r-- | src/mm-generic-gsm.c | 8 | ||||
| -rw-r--r-- | src/mm-plugin-base.c | 4 | ||||
| -rw-r--r-- | src/mm-serial-port.h | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c index f6e97c3f..0d55431d 100644 --- a/src/mm-generic-gsm.c +++ b/src/mm-generic-gsm.c @@ -673,10 +673,10 @@ mm_generic_gsm_enable_complete (MMGenericGsm *self, MM_MODEM_STATE_DISABLED, MM_MODEM_STATE_REASON_NONE); - if (priv->primary && mm_serial_port_is_open (priv->primary)) - mm_serial_port_close (priv->primary); - if (priv->secondary && mm_serial_port_is_open (priv->secondary)) - mm_serial_port_close (priv->secondary); + if (priv->primary && mm_serial_port_is_open (MM_SERIAL_PORT (priv->primary))) + mm_serial_port_close (MM_SERIAL_PORT (priv->primary)); + if (priv->secondary && mm_serial_port_is_open (MM_SERIAL_PORT (priv->secondary))) + mm_serial_port_close (MM_SERIAL_PORT (priv->secondary)); info->error = g_error_copy (error); mm_callback_info_schedule (info); diff --git a/src/mm-plugin-base.c b/src/mm-plugin-base.c index 7547fe21..9e2532b2 100644 --- a/src/mm-plugin-base.c +++ b/src/mm-plugin-base.c @@ -265,7 +265,7 @@ supports_task_dispose (GObject *object) if (priv->probe_id) g_source_remove (priv->probe_id); if (priv->probe_port) { - mm_serial_port_close (priv->probe_port); + mm_serial_port_close (MM_SERIAL_PORT (priv->probe_port)); g_object_unref (priv->probe_port); } @@ -391,7 +391,7 @@ port_buffer_full (MMSerialPort *port, GString *buffer, gpointer user_data) if (!memcmp (&buffer->str[i], *iter, iter_len)) { /* Immediately close the port and complete probing */ priv->probed_caps = 0; - mm_serial_port_close (priv->probe_port); + mm_serial_port_close (MM_SERIAL_PORT (priv->probe_port)); probe_complete (task); return; } diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h index 6835d8bf..a8ee8bee 100644 --- a/src/mm-serial-port.h +++ b/src/mm-serial-port.h @@ -50,7 +50,6 @@ struct _MMSerialPort { struct _MMSerialPortClass { MMPortClass parent; -<<<<<<< HEAD /* Called for subclasses to parse unsolicited responses. If any recognized * unsolicited response is found, it should be removed from the 'response' * byte array before returning. |