Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f523b15 authored by Rajesh Shah's avatar Rajesh Shah Committed by Greg Kroah-Hartman
Browse files

[PATCH] acpi hotplug: fix slot power-down problem with acpiphp 



Earlier I reported that Matthew's acpiphp rewrite had problem in powering down
slot on my i386 system.  The following patch is needed to get the acpiphp
rewrite properly powering down the slot.

Signed-off-by: default avatarDely Sy <dely.l.sy@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 364d5094

drivers/pci/hotplug/acpiphp_glue.c

+2 −2
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static int power_off_slot(struct acpiphp_slot *slot) 
	list_for_each (l, &slot->funcs) {

		func = list_entry(l, struct acpiphp_func, sibling);



		if (func->pci_dev && (func->flags & FUNC_HAS_PS3)) {

		if (func->flags & FUNC_HAS_PS3) {

			status = acpi_evaluate_object(func->handle, "_PS3", NULL, NULL);

			if (ACPI_FAILURE(status)) {

				warn("%s: _PS3 failed\n", __FUNCTION__);
@@ -615,7 +615,7 @@ static int power_off_slot(struct acpiphp_slot *slot) 
		func = list_entry(l, struct acpiphp_func, sibling);



		/* We don't want to call _EJ0 on non-existing functions. */

		if (func->pci_dev && (func->flags & FUNC_HAS_EJ0)) {

		if (func->flags & FUNC_HAS_EJ0) {

			/* _EJ0 method take one argument */

			arg_list.count = 1;

			arg_list.pointer = &arg;