From e71f249b661acd01cd51d1691dc93fc9a5f32f20 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 27 Oct 2007 22:14:17 +0000
Subject: [PATCH] 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
---
 sys/dev/acpica/acpi_pci_link.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index 775d0ca6b5d..b39e8e2860b 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);