diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-03-11 16:02:12 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-03-11 16:02:12 -0800 |
| commit | 4d1e00c49610b69b2446562880bef4f82b18d546 (patch) | |
| tree | 21f14421bc4e728fc4ddb88d56de41aa40e4bf42 /src/mm-generic-gsm.c | |
| parent | 3ec7e89f112cb65a584de84b76e207d7a804bd6f (diff) | |
core: fix merge damage
Diffstat (limited to 'src/mm-generic-gsm.c')
| -rw-r--r-- | src/mm-generic-gsm.c | 8 |
1 files changed, 4 insertions, 4 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); |