From: Kay Sievers <kay@vrfy.org>
Date: Wed, 7 Aug 2013 11:10:01 +0000 (+0200)
Subject: udev: hwdb - try reading modalias for usb before falling back to the composed one
X-Git-Tag: v207~169
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=0238cf7cda0720c21d9b40d7256988aba29fc565

udev: hwdb - try reading modalias for usb before falling back to the composed one
---

diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index f1c0ca9cb..d6aa96bb3 100644
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -102,13 +102,12 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device
                 if (subsystem && !streq(dsubsys, subsystem))
                         continue;
 
+                modalias = udev_device_get_property_value(d, "MODALIAS");
+
                 /* the usb_device does not have a modalias, compose one */
-                if (streq(dsubsys, "usb"))
+                if (!modalias && streq(dsubsys, "usb"))
                         modalias = modalias_usb(d, s, sizeof(s));
 
-                if (!modalias)
-                        modalias = udev_device_get_property_value(d, "MODALIAS");
-
                 if (!modalias)
                         continue;