diff options
Diffstat (limited to 'src/udev/udev-builtin-hwdb.c')
| -rw-r--r-- | src/udev/udev-builtin-hwdb.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c index 19e07e734f..4540c33d98 100644 --- a/src/udev/udev-builtin-hwdb.c +++ b/src/udev/udev-builtin-hwdb.c @@ -77,20 +77,15 @@ static int udev_builtin_hwdb_search(sd_device *dev, sd_device *srcdev, srcdev = dev; for (sd_device *d = srcdev; d; ) { - const char *dsubsys, *devtype, *modalias = NULL; - - if (sd_device_get_subsystem(d, &dsubsys) < 0) - goto next; + const char *modalias = NULL; /* look only at devices of a specific subsystem */ - if (subsystem && !streq(dsubsys, subsystem)) + if (subsystem && !device_in_subsystem(d, subsystem)) goto next; (void) sd_device_get_property_value(d, "MODALIAS", &modalias); - if (streq(dsubsys, "usb") && - sd_device_get_devtype(d, &devtype) >= 0 && - streq(devtype, "usb_device")) { + if (device_in_subsystem(d, "usb") && device_is_devtype(d, "usb_device")) { /* if the usb_device does not have a modalias, compose one */ if (!modalias) modalias = modalias_usb(d, s, sizeof(s)); |