summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-11-22 01:56:25 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-11-22 01:56:25 +0100
commitf100a74674786304a3142be49286dd96a74581a0 (patch)
tree60237defc914d05529d3fdf09b388afce0bf0a4f /include
parentMerge tag 'devicetree-fixes-for-3.18' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up (diff)
downloadlinux-f100a74674786304a3142be49286dd96a74581a0.tar.xz
linux-f100a74674786304a3142be49286dd96a74581a0.zip
Merge tag 'pm+acpi-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI power management fix from Rafael Wysocki: "This is just a one-liner fixing a regression introduced in 3.13 that broke system suspend on some Chromebooks. On those machines there are ACPI device objects for some I2C devices that can wake up the system from sleep states, but that is done via a platform-specific mechanism and the ACPI objects don't contain any wakeup-related information. When we started to use ACPI power management with those devices (which happened during the 3.13 cycle), their configuration confused the ACPI PM layer that returned error codes from suspend callbacks for them causing system suspend to fail. However, the ACPI PM layer can safely ignore the wakeup setting from a device driver if the ACPI object corresponding to the device in question doesn't contain wakeup information in which case the driver itself is responsible for setting up the device for system wakeup" * tag 'pm+acpi-3.18-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / PM: Ignore wakeup setting if the ACPI companion can't wake up
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions