---

yaml --- r: 233309 b: refs/heads/master c: 2a5d242 h: refs/heads/master i: 233307: d6cb193 v: v3
git-mirror · Feb 12, 2011 · 3e3030d · 3e3030d
1 parent 6e68b03
commit 3e3030d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d55951368faa32ff098398c56780ebb6405a3d9
+refs/heads/master: 2a5d24286e8bdafdc272b37ec5bdd9e977b3767c
diff --git a/trunk/drivers/acpi/wakeup.c b/trunk/drivers/acpi/wakeup.c
@@ -86,8 +86,12 @@ int __init acpi_wakeup_device_init(void)
 		struct acpi_device *dev = container_of(node,
 						       struct acpi_device,
 						       wakeup_list);
-		if (device_can_wakeup(&dev->dev))
+		if (device_can_wakeup(&dev->dev)) {
+			/* Button GPEs are supposed to be always enabled. */
+			acpi_enable_gpe(dev->wakeup.gpe_device,
+					dev->wakeup.gpe_number);
 			device_set_wakeup_enable(&dev->dev, true);
+		}
 	}
 	mutex_unlock(&acpi_device_lock);
 	return 0;