]> git.karo-electronics.de Git - linux-beck.git/commitdiff
PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
authorRafael J. Wysocki <rjw@sisk.pl>
Wed, 28 Sep 2011 19:44:36 +0000 (21:44 +0200)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 14 Oct 2011 16:05:32 +0000 (09:05 -0700)
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>
drivers/pci/pci-acpi.c

index cd3c4f1cdf1bdd491db1fd3a0fbb247f4363e0bf..4ecb6408b0d61e2128c26100bba3d6690402de5d 100644 (file)
@@ -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)