From: Len Brown Date: Fri, 5 Aug 2005 04:31:42 +0000 (-0400) Subject: [ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3 X-Git-Tag: v2.6.14-rc1~256^2~14^2~40 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d492eb41371d9a5145651e8eb64bea1042a4057;p=linux-2.6 [ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3 Signed-off-by: Len Brown --- 1d492eb41371d9a5145651e8eb64bea1042a4057 diff --cc drivers/acpi/pci_link.c index 834c2ceff1,a0df2f3606..26aa3829f1 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@@ -786,26 -786,7 +786,25 @@@ end return_VALUE(result); } -static int irqrouter_suspend(struct sys_device *dev, pm_message_t state) +static int +acpi_pci_link_resume( + struct acpi_pci_link *link) +{ + ACPI_FUNCTION_TRACE("acpi_pci_link_resume"); + + if (link->refcnt && link->irq.active && link->irq.initialized) + return_VALUE(acpi_pci_link_set(link, link->irq.active)); + else + return_VALUE(0); +} + +/* + * FIXME: this is a workaround to avoid nasty warning. It will be removed + * after every device calls pci_disable_device in .resume. + */ +int acpi_in_resume; +static int - irqrouter_resume( - struct sys_device *dev) ++irqrouter_resume(struct sys_device *dev) { struct list_head *node = NULL; struct acpi_pci_link *link = NULL;