From: Len Brown <len.brown@intel.com>
Date: Wed, 12 Jan 2011 09:55:46 +0000 (-0500)
Subject: Merge branch 'wakeup-etc-rafael' into release
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb4af417cce9ff87abf33a6bb9a0cf613e285364;p=linux-beck.git

Merge branch 'wakeup-etc-rafael' into release
---

fb4af417cce9ff87abf33a6bb9a0cf613e285364
diff --cc drivers/acpi/wakeup.c
index c6cb68e0a80c,f252d0de9922..ed6501452507
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@@ -63,14 -64,15 +64,15 @@@ void acpi_disable_wakeup_devices(u8 sle
  			container_of(node, struct acpi_device, wakeup_list);
  
  		if (!dev->wakeup.flags.valid
- 		    || !(dev->wakeup.state.enabled || dev->wakeup.prepare_count)
- 		    || (sleep_state > (u32) dev->wakeup.sleep_state))
+ 		    || sleep_state > (u32) dev->wakeup.sleep_state
+ 		    || !(device_may_wakeup(&dev->dev)
+ 		        || dev->wakeup.prepare_count))
  			continue;
  
 -		acpi_gpe_wakeup(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
 +		acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
  				ACPI_GPE_DISABLE);
  
- 		if (dev->wakeup.state.enabled)
+ 		if (device_may_wakeup(&dev->dev))
  			acpi_disable_wakeup_device_power(dev);
  	}
  }