summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-03-14 04:18:20 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:53:18 -0700
commitca4c984cf5a2ee3e8d61d16bb3391ed6ff5f4cc7 (patch)
tree82686173d2e6d6a05bbf7b91e3d94e34bbc838b7
parentd6d1a18d7245b8065df95775c6d45fe2d8f2e66a (diff)
[PATCH] correct rule match for devices without a physical device
-rw-r--r--udev_rules.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/udev_rules.c b/udev_rules.c
index f09d6d47bf..3dc77855da 100644
--- a/udev_rules.c
+++ b/udev_rules.c
@@ -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 */