From f67b97325d35495f0f6b22ecf2a2ca693828b0bc Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Fri, 23 Nov 2012 21:07:12 +0100 Subject: [PATCH] --- yaml --- r: 336628 b: refs/heads/master c: 2905875344f977acd188a2b0f1d163491e91459b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pnp/pnpacpi/core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dab6a1ee001f..5a7fb0ee3d26 100644 --- 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 index 26b5d4b18dd7..653d5637a37c 100644 --- 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.