From a7402175da70f53d308450b50dd0c00cb733276e Mon Sep 17 00:00:00 2001 From: "greg@kroah.com" Date: Thu, 25 Dec 2003 00:33:00 -0800 Subject: [PATCH] If a LABEL rule has a BUS id, then we must check to see if the device is on a bus. --- namedev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/namedev.c b/namedev.c index de1b206180..813f26b035 100644 --- a/namedev.c +++ b/namedev.c @@ -473,7 +473,10 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev, if (dev->type != LABEL) continue; - if (sysfs_device) { + if (dev->bus[0] != '\0') { + /* as the user specified a bus, we must match it up */ + if (!sysfs_device) + continue; dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus); if (strcasecmp(dev->bus, sysfs_device->bus) != 0) continue; -- cgit v1.2.3-54-g00ecf