shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-30 06:25:25 +03:00
Code

[PATCH] correct rule match for devices without a physical device

Browse Source
This commit is contained in:
kay.sievers@vrfy.org 2005-03-14 04:18:20 +01:00 committed by Greg KH
parent d6d1a18d72
commit ca4c984cf5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
udev_rules.c
View File

@ -564,7 +564,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
if (rule->driver[0] != '\0') {
if (sysfs_device == NULL) {
dbg("device has no sysfs_device");
goto try_parent;
goto exit;
}
dbg("check for " KEY_DRIVER " rule->driver='%s' sysfs_device->driver_name='%s'",
rule->driver, sysfs_device->driver_name);
@ -584,7 +584,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
if (rule->bus[0] != '\0') {
if (sysfs_device == NULL) {
dbg("device has no sysfs_device");
goto try_parent;
goto exit;
}
dbg("check for " KEY_BUS " rule->bus='%s' sysfs_device->bus='%s'",
rule->bus, sysfs_device->bus);
@ -604,7 +604,7 @@ static int match_rule(struct udevice *udev, struct udev_rule *rule,
if (rule->id[0] != '\0') {
if (sysfs_device == NULL) {
dbg("device has no sysfs_device");
goto try_parent;
goto exit;
}
dbg("check " KEY_ID);
if (strcmp_pattern(rule->id, sysfs_device->bus_id) != 0) {
@ -648,8 +648,8 @@ try_parent:
sysfs_device = sysfs_get_device_parent(sysfs_device);
if (sysfs_device == NULL)
goto exit;
dbg("sysfs_device->path='%s'", sysfs_device->path);
dbg("sysfs_device->bus_id='%s'", sysfs_device->bus_id);
dbg("look at sysfs_device->path='%s'", sysfs_device->path);
dbg("look at sysfs_device->bus_id='%s'", sysfs_device->bus_id);
}
/* execute external program */