From 53cbba88408ea13733b12e94bfddd16dc30b14dc Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Fri, 8 May 2009 00:22:29 -0400
Subject: [PATCH] --- yaml --- r: 145055 b: refs/heads/master c:
 19bde778c1fd2574cc020a618d7d576f260271ca h: refs/heads/master i:   145053:
 dad30eba1e156db5b58eb20078fd906228a7b974   145051:
 c311e35aba7877f3eab81ea4bd88a3251efcaf67   145047:
 b2f6e218cffc6301808b4c956bbcea39909dc306   145039:
 cef210d6522e915a763c22e2cb65d92685006151   145023:
 3c80fb706b8fa1bc03c7e3889db7425c9ff5debe v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/pnp/pnpacpi/core.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 89b8711b340d..92fa68f10822 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddc50b6ad634d9ce2526a777d4b7da80effdfb60
+refs/heads/master: 19bde778c1fd2574cc020a618d7d576f260271ca
diff --git a/trunk/drivers/pnp/pnpacpi/core.c b/trunk/drivers/pnp/pnpacpi/core.c
index 9a3a682c6981..9496494f340e 100644
--- a/trunk/drivers/pnp/pnpacpi/core.c
+++ b/trunk/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;