diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2015-01-22 11:50:24 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-02-02 10:11:25 -0800 |
| commit | 01395d798452435f19de3bfe5d04325db4e49677 (patch) | |
| tree | 2fe1c2b42d207a04c5846fa0cbe39471fdf401a7 /drivers/pnp | |
| parent | 2f7f558c222bc0ed617aa9888d0043a9aeeba253 (diff) | |
| download | talos-obmc-linux-01395d798452435f19de3bfe5d04325db4e49677.tar.gz talos-obmc-linux-01395d798452435f19de3bfe5d04325db4e49677.zip | |
PNP: Allow console to override ACPI device sleep
If the serial console is an ACPI PNP device, the PNP bus always powers
down the device at system suspend, even though the no_console_suspend
command line parameter is specified (eg., when debugging suspend/resume).
Add PNP_CONSOLE capability, which when set, prevents calling both the
->disable() and ->suspend() PNP protocol methods if console suspend
is disabled.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index f748cc8cbb03..4e57d3370368 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c @@ -182,7 +182,7 @@ static int __pnp_bus_suspend(struct device *dev, pm_message_t state) return error; } - if (pnp_dev->protocol->suspend) + if (pnp_can_suspend(pnp_dev)) pnp_dev->protocol->suspend(pnp_dev, state); return 0; } |
