plugin-base: better detection of physical device

1 files changed, 29 insertions, 14 deletions

diff --git a/src/mm-plugin-base.c b/src/mm-plugin-base.c
index 25456ca5..367f40ea 100644
--- a/src/mm-plugin-base.c
+++ b/src/mm-plugin-base.c
@@ -680,34 +680,49 @@ get_driver_name (GUdevDevice *device)
 static GUdevDevice *
 real_find_physical_device (MMPluginBase *plugin, GUdevDevice *child)
 {
-    GUdevDevice *iter, *old = NULL;
-    const char *bus, *type;
+    GUdevDevice *parent = NULL, *physdev = NULL;
+    const char *subsys, *type;
 
     g_return_val_if_fail (child != NULL, NULL);
 
-    bus = g_udev_device_get_property (child, "ID_BUS");
-    if (!bus)
-        return NULL;
+    subsys = g_udev_device_get_subsystem (child);
+    g_assert (subsys);
+    if (strcmp (subsys, "usb") && strcmp (subsys, "pci")) {
+        /* Try the parent */
+        parent = g_udev_device_get_parent (child);
+        if (!parent)
+            goto out;
+
+        subsys = g_udev_device_get_subsystem (parent);
+        if (strcmp (subsys, "usb") && strcmp (subsys, "pci"))
+            goto out;
+    }
+
+    if (!strcmp (subsys, "usb")) {
+        GUdevDevice *iter, *old = NULL;
 
-    if (!strcmp (bus, "usb")) {
         /* Walk the parents to find the 'usb_device' for this device. */
         iter = g_object_ref (child);
         while (iter) {
             type = g_udev_device_get_devtype (iter);
-            if (type && !strcmp (type, "usb_device"))
-                return iter;
+            if (type && !strcmp (type, "usb_device")) {
+                physdev = iter;
+                break;
+            }
 
             old = iter;
             iter = g_udev_device_get_parent (old);
             g_object_unref (old);
         }
-        g_object_unref (child);
-    } else if (!strcmp (bus, "pci")) {
-        return g_udev_device_get_parent (child);
-    }
+    } else if (!strcmp (subsys, "pci"))
+        physdev = g_udev_device_get_parent (child);
 
-    // FIXME: pci and pcmcia/cardbus? (like Sierra 850/860)
-    return NULL;
+    // FIXME: pcmcia (like Sierra 850/860)
+
+out:
+    if (parent)
+        g_object_unref (parent);
+    return physdev;
 }
 
 static MMPluginSupportsResult