Commit 78d090b0 authored Sep 28, 2011 by Rafael J. Wysocki Committed by Jesse Barnes Oct 14, 2011

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>

parent 6af8bef1

drivers/pci/pci-acpi.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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)