Merge branch 'openelec-next' into openelec-pvr

This commit is contained in:
Stephan Raue 2011-04-26 12:27:24 +02:00
commit cc67bbee67
2 changed files with 35 additions and 2 deletions

View File

@ -0,0 +1,31 @@
===================================================================
--- linux-2.6.orig/drivers/base/power/main.c
+++ linux-2.6/drivers/base/power/main.c
@@ -63,6 +63,7 @@ void device_pm_init(struct device *dev)
dev->power.wakeup = NULL;
spin_lock_init(&dev->power.lock);
pm_runtime_init(dev);
+ INIT_LIST_HEAD(&dev->power.entry);
}
/**
Index: linux-2.6/drivers/base/power/wakeup.c
===================================================================
--- linux-2.6.orig/drivers/base/power/wakeup.c
+++ linux-2.6/drivers/base/power/wakeup.c
@@ -258,7 +258,7 @@ void device_set_wakeup_capable(struct de
if (!!dev->power.can_wakeup == !!capable)
return;
- if (device_is_registered(dev)) {
+ if (device_is_registered(dev) && !list_empty(&dev->power.entry)) {
if (capable) {
if (wakeup_sysfs_add(dev))
return;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

View File

@ -28,6 +28,7 @@
KEY_ESC = KEY_DELETE # Delete/Clear KEY_ESC = KEY_DELETE # Delete/Clear
KEY_HOME = KEY_HOME # Home KEY_HOME = KEY_HOME # Home
KEY_MEDIA = KEY_PROG1 # Home
KEY_SLEEP = KEY_POWER # Power KEY_SLEEP = KEY_POWER # Power
KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Vol - KEY_VOLUMEDOWN = KEY_VOLUMEDOWN # Vol -
@ -46,7 +47,7 @@
KEY_DVD = KEY_DVD # DVD/VCD KEY_DVD = KEY_DVD # DVD/VCD
KEY_MP3 = KEY_AUDIO # Music KEY_MP3 = KEY_AUDIO # Music
KEY_MEDIA = KEY_CAMERA # Pictures KEY_CAMERA = KEY_CAMERA # Pictures
KEY_VIDEO = KEY_VIDEO # Videos KEY_VIDEO = KEY_VIDEO # Videos
KEY_RADIO = KEY_ZOOM # Radio # Remap because we need the zoom key KEY_RADIO = KEY_ZOOM # Radio # Remap because we need the zoom key
KEY_AUDIO = KEY_AUDIO # SAP KEY_AUDIO = KEY_AUDIO # SAP
@ -60,8 +61,9 @@
KEY_LANGUAGE = KEY_LANGUAGE # Language KEY_LANGUAGE = KEY_LANGUAGE # Language
KEY_ANGLE = KEY_ANGLE # Angle KEY_ANGLE = KEY_ANGLE # Angle
KEY_MODE = KEY_MODE # Radio # Remap because we need the zoom key
KEY_PROPS = KEY_INFO # Info/EPG KEY_PROPS = KEY_INFO # Info/EPG
KEY_MENU = KEY_DVD # DVD Menu KEY_MENU = KEY_MENU # DVD Menu
KEY_RED = KEY_RED # Red KEY_RED = KEY_RED # Red
KEY_GREEN = KEY_GREEN # Green KEY_GREEN = KEY_GREEN # Green