diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-08-26 18:27:36 +0200 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2014-08-27 21:44:02 -0400 |
| commit | 7a2f160498e5657440baec0faa1508b029f09b51 (patch) | |
| tree | 319d956337863aa606a2d8b6c137e2dad059ec1d /src/udev | |
| parent | e7adcb63310537f48dd869198c0d52032e88df91 (diff) | |
udev: hwdb - do not look at "usb_device" parents
Based on a patch from Simon McVittie <simon.mcvittie@collabora.co.uk>.
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758050
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-builtin-hwdb.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index cac97e756b..695a31a12f 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -88,9 +88,10 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device const char *filter, bool test) { struct udev_device *d; char s[16]; - int n = 0; + bool last = false; + int r = 0; - for (d = srcdev; d; d = udev_device_get_parent(d)) { + for (d = srcdev; d && !last; d = udev_device_get_parent(d)) { const char *dsubsys; const char *modalias = NULL; @@ -104,19 +105,24 @@ static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device modalias = udev_device_get_property_value(d, "MODALIAS"); - /* the usb_device does not have a modalias, compose one */ - if (!modalias && streq(dsubsys, "usb")) - modalias = modalias_usb(d, s, sizeof(s)); + if (streq(dsubsys, "usb") && streq_ptr(udev_device_get_devtype(d), "usb_device")) { + /* if the usb_device does not have a modalias, compose one */ + if (!modalias) + modalias = modalias_usb(d, s, sizeof(s)); + + /* avoid looking at any parent device, they are usually just a USB hub */ + last = true; + } if (!modalias) continue; - n = udev_builtin_hwdb_lookup(dev, prefix, modalias, filter, test); - if (n > 0) + r = udev_builtin_hwdb_lookup(dev, prefix, modalias, filter, test); + if (r > 0) break; } - return n; + return r; } static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool test) { |