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

core: tear down all pending work when closing a port

Browse Source 
Make sure all pending work, if any, is torn down when closing
the port, since it's closed, and is likely going to get unreffed
soon and we don't want anything running after the port is dead.
This commit is contained in:
Dan Williams
2011-04-18 17:39:59 -05:00
parent fca4d3aa37
commit 74b1503c60
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mm-serial-port.c
View File

@@ -837,6 +837,8 @@ mm_serial_port_close (MMSerialPort *self)
priv->connected_id = 0;
}
mm_serial_port_flash_cancel (self);
if (priv->fd >= 0) {
GTimeVal tv_start, tv_end;
@@ -852,8 +854,6 @@ mm_serial_port_close (MMSerialPort *self)
priv->channel = NULL;
}
mm_serial_port_flash_cancel (self);
g_get_current_time (&tv_start);
tcsetattr (priv->fd, TCSANOW, &priv->old_t);
@@ -901,6 +901,16 @@ mm_serial_port_close (MMSerialPort *self)
g_slice_free (MMQueueData, item);
}
g_queue_clear (priv->queue);
if (priv->timeout_id) {
g_source_remove (priv->timeout_id);
priv->timeout_id = 0;
}
if (priv->queue_id) {
g_source_remove (priv->queue_id);
priv->queue_id = 0;
}
}
void