diff options
| author | Robert Richter | 2009-06-10 21:47:10 +0200 |
|---|---|---|
| committer | Robert Richter | 2009-06-10 21:47:10 +0200 |
| commit | 0886751c5d8b19fcee2e65d34ae21c9111e652a9 (patch) | |
| tree | 015e8c2b3d44d46e9e8fccd016340c51bc876d3b /drivers/pnp | |
| parent | oprofile: introduce module_param oprofile.cpu_type (diff) | |
| parent | Linux 2.6.30 (diff) | |
| download | kernel-qcow2-linux-0886751c5d8b19fcee2e65d34ae21c9111e652a9.tar.gz kernel-qcow2-linux-0886751c5d8b19fcee2e65d34ae21c9111e652a9.tar.xz kernel-qcow2-linux-0886751c5d8b19fcee2e65d34ae21c9111e652a9.zip | |
Merge commit 'v2.6.30' into oprofile/master
Diffstat (limited to 'drivers/pnp')
| -rw-r--r-- | drivers/pnp/pnpacpi/core.c | 8 |
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; |