aboutsummaryrefslogtreecommitdiff
path: root/src/mm-plugin-base.c
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2010-03-11 16:02:12 -0800
committerDan Williams <dcbw@redhat.com>2010-03-11 16:02:12 -0800
commit4d1e00c49610b69b2446562880bef4f82b18d546 (patch)
tree21f14421bc4e728fc4ddb88d56de41aa40e4bf42 /src/mm-plugin-base.c
parent3ec7e89f112cb65a584de84b76e207d7a804bd6f (diff)
core: fix merge damage
Diffstat (limited to 'src/mm-plugin-base.c')
-rw-r--r--src/mm-plugin-base.c4
1 files changed, 2 insertions, 2 deletions
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;
}