---

yaml --- r: 350943 b: refs/heads/master c: 65ab96f h: refs/heads/master i: 350941: 6aa0ab6 350939: 80119ce 350935: 298c04c 350927: 06f81bc 350911: d81a1fa v: v3
git-mirror · Jan 27, 2013 · 513d381 · 513d381
1 parent 8fc5fd4
commit 513d381
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 660b1113e0f33a476952cb2cbcb5c9831e7ff4cd
+refs/heads/master: 65ab96f60621c4da8f1b4087a57b788bc4d8f27b
diff --git a/trunk/drivers/acpi/proc.c b/trunk/drivers/acpi/proc.c
@@ -311,11 +311,12 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
 			   dev->pnp.bus_id,
 			   (u32) dev->wakeup.sleep_state);
 
-		if (!dev->physical_node_count)
+		if (!dev->physical_node_count) {
 			seq_printf(seq, "%c%-8s\n",
-				dev->wakeup.flags.run_wake ?
-				'*' : ' ', "disabled");
-		else {
+				dev->wakeup.flags.run_wake ? '*' : ' ',
+				device_may_wakeup(&dev->dev) ?
+					"enabled" : "disabled");
+		} else {
 			struct device *ldev;
 			list_for_each_entry(entry, &dev->physical_node_list,
 					node) {