summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2007-10-27 22:14:17 +0000
committerjhb <jhb@FreeBSD.org>2007-10-27 22:14:17 +0000
commit2a9cc515806c61986c713946ca9bf068bee79012 (patch)
tree66ffdf160b6850b85a3b802b204a435cf8ae5f67
parent3ee3b45ab86278f68d3c2dd9cf172c46447a19ff (diff)
downloadFreeBSD-src-2a9cc515806c61986c713946ca9bf068bee79012.zip
FreeBSD-src-2a9cc515806c61986c713946ca9bf068bee79012.tar.gz
Don't return an error from resume() if execution of _DIS fails for some
reason (not all BIOSen have _DIS methods for all link devices for example). This matches the behavior of attach() with respect to _DIS as well. Submitted by: njl
-rw-r--r--sys/dev/acpica/acpi_pci_link.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 775d0ca..b39e8e2 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -932,9 +932,10 @@ acpi_pci_link_resume(device_t dev)
routed++;
if (routed == sc->pl_num_links)
status = acpi_pci_link_route_irqs(dev);
- else
- status = AcpiEvaluateObject(acpi_get_handle(dev), "_DIS", NULL,
- NULL);
+ else {
+ AcpiEvaluateObject(acpi_get_handle(dev), "_DIS", NULL, NULL);
+ status = AE_OK;
+ }
ACPI_SERIAL_END(pci_link);
if (ACPI_FAILURE(status))
return (ENXIO);
OpenPOWER on IntegriCloud