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

From: Greg KH
Date: Tue Jun 28 2005 - 01:00:26 EST


[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: Dely Sy <dely.l.sy@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
commit 2f523b15901f654a9448bbd47ebe1e783ec3195b
tree 74270f9c16021a5b4accbaadddb50475e3e44701
parent 364d5094a43ff2ceff3d19e40c4199771cb6cb8f
author Rajesh Shah <rajesh.shah@xxxxxxxxx> Thu, 28 Apr 2005 00:25:55 -0700
committer Greg Kroah-Hartman <gregkh@xxxxxxx> Mon, 27 Jun 2005 21:52:43 -0700

drivers/pci/hotplug/acpiphp_glue.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -600,7 +600,7 @@ static int power_off_slot(struct acpiphp
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
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;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/