diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-28 21:44:36 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-10-14 09:05:32 -0700 |
| commit | 78d090b0be3f072a3c95022771c35183af961aaa (patch) | |
| tree | ce8de79a4ab712a8c34e2abda68bcacde5173c40 | |
| parent | 6af8bef14d6fc9e4e52c83fd646412e9dedadd26 (diff) | |
| download | op-kernel-dev-78d090b0be3f072a3c95022771c35183af961aaa.zip op-kernel-dev-78d090b0be3f072a3c95022771c35183af961aaa.tar.gz | |
PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
The result returned by acpi_dev_run_wake() is always either -EINVAL
or -ENODEV, while obviously it should return 0 on success. The
problem is that the leftover error variable, that's not really used
in the function, is initialized with -ENODEV and then returned
without modification.
To fix this issue remove the error variable from acpi_dev_run_wake()
and make the function return 0 on success as appropriate.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
| -rw-r--r-- | drivers/pci/pci-acpi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c index cd3c4f1..4ecb640 100644 --- a/drivers/pci/pci-acpi.c +++ b/drivers/pci/pci-acpi.c @@ -285,7 +285,6 @@ static int acpi_dev_run_wake(struct device *phys_dev, bool enable) { struct acpi_device *dev; acpi_handle handle; - int error = -ENODEV; if (!device_run_wake(phys_dev)) return -EINVAL; @@ -305,7 +304,7 @@ static int acpi_dev_run_wake(struct device *phys_dev, bool enable) acpi_disable_wakeup_device_power(dev); } - return error; + return 0; } static void acpi_pci_propagate_run_wake(struct pci_bus *bus, bool enable) |
