---
 plugins/udevng.c |   30 +++++++++++++++++++++---------
 1 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/plugins/udevng.c b/plugins/udevng.c
index be87320..67660e3 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -235,6 +235,7 @@ static gboolean setup_sierra(struct modem_info *modem)
 static gboolean setup_huawei(struct modem_info *modem)
 {
        const char *mdm = NULL, *pcui = NULL, *diag = NULL;
+       const char *default_pcui = NULL;
        GSList *list;
 
        DBG("%s", modem->syspath);
@@ -264,22 +265,33 @@ static gboolean setup_huawei(struct modem_info *modem)
                        if (mdm != NULL && pcui != NULL)
                                break;
                } else if (g_strcmp0(info->interface, "255/255/255") == 0) {
-                       if (g_strcmp0(info->number, "00") == 0)
+                       if (mdm == NULL && g_strcmp0(info->number, "00") == 0)
                                mdm = info->devnode;
-                       else if (g_strcmp0(info->number, "01") == 0)
-                               pcui = info->devnode;
-                       else if (g_strcmp0(info->number, "02") == 0)
-                               pcui = info->devnode;
-                       else if (g_strcmp0(info->number, "03") == 0)
-                               pcui = info->devnode;
-                       else if (g_strcmp0(info->number, "04") == 0)
-                               pcui = info->devnode;
+                       else if (diag == NULL) {
+                               if (g_strcmp0(info->number, "01") == 0)
+                                       diag = info->devnode;
+                       } else if (pcui == NULL) {
+                               if (g_strcmp0(info->number, "01") == 0)
+                                       default_pcui = info->devnode;
+                               else if (g_strcmp0(info->number, "02") == 0)
+                                       default_pcui = info->devnode;
+                               else if (g_strcmp0(info->number, "03") == 0)
+                                       default_pcui = info->devnode;
+                               else if (g_strcmp0(info->number, "04") == 0)
+                                       default_pcui = info->devnode;
+                       }
                }
        }
 
+       if (pcui == NULL && default_pcui != NULL)
+               pcui = default_pcui;
+
        if (mdm == NULL || pcui == NULL)
                return FALSE;
 
+       if (diag != NULL && g_strcmp0(diag, pcui) == 0)
+               diag = NULL;
+
        DBG("modem=%s pcui=%s diag=%s", mdm, pcui, diag);
 
        ofono_modem_set_string(modem->modem, "Modem", mdm);
-- 
1.7.1

_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono

Reply via email to