commit 36f36a9819716f7ee66ade59f7d9a83bc6febe66
author Ben Chan <benchan@chromium.org> Thu Apr 03 21:31:35 2014
committer Ben Chan <benchan@chromium.org> Thu Apr 03 21:31:35 2014
tree f9aaf67252d4fab41cf999099757ffac50b8e1e6
parent d83cee4266a0772890bf784222167e516e97b886
parent 79b34b77b4703eaaf7e007c294325a660a51bc9e

Merge remote-tracking branch 'cros/upstream' into 'cros/master'

plugins/novatel/mm-broadband-modem-novatel.c

diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/plugins/novatel/mm-broadband-modem-novatel.c
index 1cbaa50..e4b6b6a 100644
--- a/plugins/novatel/mm-broadband-modem-novatel.c
+++ b/plugins/novatel/mm-broadband-modem-novatel.c
@@ -815,6 +815,8 @@
         quality = get_one_quality (response, "1x RSSI=");
     if (quality < 0)
         quality = get_one_quality (response, "RX1=");
+    if (quality < 0)
+        quality = get_one_quality (response, "HDR RSSI=");
 
     if (quality >= 0)
         g_simple_async_result_set_op_res_gpointer (simple,

src/77-mm-usb-device-blacklist.rules

diff --git a/src/77-mm-usb-device-blacklist.rules b/src/77-mm-usb-device-blacklist.rules
index 59795b6..7bb894f 100644
--- a/src/77-mm-usb-device-blacklist.rules
+++ b/src/77-mm-usb-device-blacklist.rules
@@ -88,6 +88,12 @@
 ATTRS{idVendor}=="239a", ATTRS{idProduct}=="0004", ENV{ID_MM_DEVICE_IGNORE}="1"
 ATTRS{idVendor}=="239a", ATTRS{idProduct}=="8004", ENV{ID_MM_DEVICE_IGNORE}="1"
 
+# All devices from Pololu Corporation
+# except some possible future products.
+ATTRS{idVendor}=="1ffb", ENV{ID_MM_DEVICE_IGNORE}="1"
+ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="00ad", ENV{ID_MM_DEVICE_IGNORE}="0"
+ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="00ae", ENV{ID_MM_DEVICE_IGNORE}="0"
+
 # Altair U-Boot device
 ATTRS{idVendor}=="0216", ATTRS{idProduct}=="0051", ENV{ID_MM_DEVICE_IGNORE}="1"
 

src/mm-port-probe.c

diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c
index 3d6a060..a0028c7 100644
--- a/src/mm-port-probe.c
+++ b/src/mm-port-probe.c
@@ -509,22 +509,6 @@
                         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 @@
             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);