ACPI: suspend: don't let device _PS3 failure prevent suspend

6328a57401dc5f5cf9931738eb7268fcd8058c49
"Enable PNPACPI _PSx Support, v3"

added a call to acpi_bus_set_power(handle, ACPI_STATE_D3)
to pnpacpi_disable_resource() before the existing call
to evaluate _DIS on the device.

This caused suspend to fail on the system in
http://bugzilla.kernel.org/show_bug.cgi?id=13243
because the sanity check to verify we entered _PS3
failed on the serial port.

As a work-around, that sanity check can be disabled
system-wide with "acpi.power_nocheck=1"

Or perhaps we should just shrug off the _PS3 failure
and carry on with _DIS like we used to -- which is
what this patch does.

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index 9a3a682c6981..9496494f340e 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -110,11 +110,9 @@ static int pnpacpi_disable_resources(struct pnp_dev *dev)
 
         /* acpi_unregister_gsi(pnp_irq(dev, 0)); */
         ret = 0;
-        if (acpi_bus_power_manageable(handle)) {
-                ret = acpi_bus_set_power(handle, ACPI_STATE_D3);
-                if (ret)
-                        return ret;
-        }
+        if (acpi_bus_power_manageable(handle))
+                acpi_bus_set_power(handle, ACPI_STATE_D3);
+                /* continue even if acpi_bus_set_power() fails */
         if (ACPI_FAILURE(acpi_evaluate_object(handle, "_DIS", NULL, NULL)))
                 ret = -ENODEV;
         return ret;