---

yaml --- r: 162340 b: refs/heads/master c: a37b0da h: refs/heads/master v: v3
git-mirror · Sep 15, 2009 · 22db494 · 22db494
1 parent 7da2f37
commit 22db494
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df45517536eb010ce2b3c4c7b75c1a02bdb10018
+refs/heads/master: a37b0dad8b3d278fa64482ccd2381c947f432bf7
diff --git a/trunk/drivers/staging/vme/vme.c b/trunk/drivers/staging/vme/vme.c
@@ -1302,9 +1302,17 @@ static int vme_bus_match(struct device *dev, struct device_driver *drv)
 	while((driver->bind_table[i].bus != 0) ||
 		(driver->bind_table[i].slot != 0)) {
 
-		if ((bridge->num == driver->bind_table[i].bus) &&
-			(num == driver->bind_table[i].slot))
-			return 1;
+		if (bridge->num == driver->bind_table[i].bus) {
+			if (num == driver->bind_table[i].slot)
+				return 1;
+
+			if (driver->bind_table[i].slot == VME_SLOT_ALL)
+				return 1;
+
+			if ((driver->bind_table[i].slot == VME_SLOT_CURRENT) &&
+				(num == vme_slot_get(dev)))
+				return 1;
+		}
 		i++;
 	}
 

diff --git a/trunk/drivers/staging/vme/vme.h b/trunk/drivers/staging/vme/vme.h
@@ -79,6 +79,9 @@ struct vme_resource {
 
 extern struct bus_type vme_bus_type;
 
+#define VME_SLOT_CURRENT	-1
+#define VME_SLOT_ALL		-2
+
 struct vme_device_id {
 	int bus;
 	int slot;