From c9b7761ed5ae83989cd3c8e2fbb5fc413c351102 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Mon, 1 Apr 2013 14:12:54 +0200
Subject: base-modem: don't assume all cdc-wdm ports are QMI

---
 src/mm-base-modem.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c
index 7407682d..7e74328a 100644
--- a/src/mm-base-modem.c
+++ b/src/mm-base-modem.c
@@ -242,17 +242,20 @@ mm_base_modem_grab_port (MMBaseModem *self,
     else if (g_str_has_prefix (subsys, "usb") &&
              g_str_has_prefix (name, "cdc-wdm")) {
 #if defined WITH_QMI
-        port = MM_PORT (mm_qmi_port_new (name));
-#else
-        g_set_error (error,
-                     MM_CORE_ERROR,
-                     MM_CORE_ERROR_UNSUPPORTED,
-                     "Cannot add port '%s/%s', QMI support not available",
-                     subsys,
-                     name);
-        g_free (key);
-        return FALSE;
+        if (ptype == MM_PORT_TYPE_QMI)
+            port = MM_PORT (mm_qmi_port_new (name));
+        else
 #endif
+        {
+            g_set_error (error,
+                         MM_CORE_ERROR,
+                         MM_CORE_ERROR_UNSUPPORTED,
+                         "Cannot add port '%s/%s', unsupported",
+                         subsys,
+                         name);
+            g_free (key);
+            return FALSE;
+        }
     }
     else
         /* We already filter out before all non-tty, non-net, non-qmi ports */
-- 
cgit v1.2.3