---

yaml --- r: 145055 b: refs/heads/master c: 19bde77 h: refs/heads/master i: 145053: dad30eb 145051: c311e35 145047: b2f6e21 145039: cef210d 145023: 3c80fb7 v: v3
git-mirror · May 8, 2009 · 53cbba8 · 53cbba8
1 parent 6f57285
commit 53cbba8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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;