From 79b34b77b4703eaaf7e007c294325a660a51bc9e Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Wed, 2 Apr 2014 23:34:42 -0700 Subject: port-probe: remove the 3s wait before opening a MBIM port The 3s wait before opening a MBIM port is not necessary for handling a delayed response to the MBIM OPEN messages. mbim_device_open() already retries the MBIM OPEN message when the MBIM device does not respond. --- src/mm-port-probe.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 3d6a0600..a0028c7e 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -509,22 +509,6 @@ mbim_port_open_ready (MMPortMbim *mbim_port, self); } -static gboolean -mbim_sleep_ready (MMPortProbe *self) -{ - PortProbeRunTask *task = self->priv->task; - - task->source_id = 0; - - /* Create a port and try to open it */ - task->mbim_port = mm_port_mbim_new (g_udev_device_get_name (self->priv->port)); - mm_port_mbim_open (task->mbim_port, - NULL, - (GAsyncReadyCallback)mbim_port_open_ready, - self); - return FALSE; -} - #endif /* WITH_MBIM */ static void @@ -537,7 +521,12 @@ wdm_probe_mbim (MMPortProbe *self) g_udev_device_get_subsystem (self->priv->port), g_udev_device_get_name (self->priv->port)); - task->source_id = g_timeout_add_seconds (3, (GSourceFunc)mbim_sleep_ready, self); + /* Create a port and try to open it */ + task->mbim_port = mm_port_mbim_new (g_udev_device_get_name (self->priv->port)); + mm_port_mbim_open (task->mbim_port, + NULL, + (GAsyncReadyCallback)mbim_port_open_ready, + self); #else /* If not compiled with MBIM support, just assume we won't have any MBIM port */ mm_port_probe_set_result_mbim (self, FALSE); -- cgit v1.2.3-70-g09d2