From 7d74143b92f984ee3dfb7d02635592f71d1bb32b Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 6 Jan 2011 23:33:30 +0100 Subject: [PATCH] --- yaml --- r: 230905 b: refs/heads/master c: b014f4f1aad3f25d5c7d877a394869645ea0c96b h: refs/heads/master i: 230903: 36b0c9cbfb9867f2964cbd19cb59374fa60f8cbd v: v3 --- [refs] | 2 +- trunk/drivers/acpi/proc.c | 26 +------------------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index aa1472774954..45189d4cb899 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cd031441a4fd09273b7c2beb337d0b2683d104c +refs/heads/master: b014f4f1aad3f25d5c7d877a394869645ea0c96b diff --git a/trunk/drivers/acpi/proc.c b/trunk/drivers/acpi/proc.c index afad67769db6..129effbb7bd4 100644 --- a/trunk/drivers/acpi/proc.c +++ b/trunk/drivers/acpi/proc.c @@ -341,7 +341,6 @@ acpi_system_write_wakeup_device(struct file *file, char strbuf[5]; char str[5] = ""; unsigned int len = count; - struct acpi_device *found_dev = NULL; if (len > 4) len = 4; @@ -363,33 +362,10 @@ acpi_system_write_wakeup_device(struct file *file, if (!strncmp(dev->pnp.bus_id, str, 4)) { dev->wakeup.state.enabled = dev->wakeup.state.enabled ? 0 : 1; - found_dev = dev; + physical_device_enable_wakeup(dev); break; } } - if (found_dev) { - physical_device_enable_wakeup(found_dev); - list_for_each_safe(node, next, &acpi_wakeup_device_list) { - struct acpi_device *dev = container_of(node, - struct - acpi_device, - wakeup_list); - - if ((dev != found_dev) && - (dev->wakeup.gpe_number == - found_dev->wakeup.gpe_number) - && (dev->wakeup.gpe_device == - found_dev->wakeup.gpe_device)) { - printk(KERN_WARNING - "ACPI: '%s' and '%s' have the same GPE, " - "can't disable/enable one separately\n", - dev->pnp.bus_id, found_dev->pnp.bus_id); - dev->wakeup.state.enabled = - found_dev->wakeup.state.enabled; - physical_device_enable_wakeup(dev); - } - } - } mutex_unlock(&acpi_device_lock); return count; }