---

yaml --- r: 336628 b: refs/heads/master c: 2905875 h: refs/heads/master v: v3
git-mirror · Nov 23, 2012 · f67b973 · f67b973
1 parent ba3973e
commit f67b973
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 907ddf89d0bb7f57e1e21485900e6564a1ab512a
+refs/heads/master: 2905875344f977acd188a2b0f1d163491e91459b
diff --git a/trunk/drivers/pnp/pnpacpi/core.c b/trunk/drivers/pnp/pnpacpi/core.c
@@ -242,6 +242,10 @@ static int __init pnpacpi_add_device(struct acpi_device *device)
 	char *pnpid;
 	struct acpi_hardware_id *id;
 
+	/* Skip devices that are already bound */
+	if (device->physical_node_count)
+		return 0;
+
 	/*
 	 * If a PnPacpi device is not present , the device
 	 * driver should not be loaded.