From: Tomas Hruby <tom@minix3.org>
Date: Fri, 6 May 2011 15:41:14 +0000 (+0200)
Subject: PCI - do not panic when ACPI cannot map bridges
X-Git-Tag: v3.2.0~563
X-Git-Url: http://zhaoyanbai.com/repos/%22../static/icons/mdoc.3.ps?a=commitdiff_plain;h=f5a1e58f590ae7a0925eba8f9fccae4341534af2;p=minix.git

PCI - do not panic when ACPI cannot map bridges

- when ACPI does not find mappings for pci brdiges, do no panic,
  only report a warning and continue to a fallback which uses
  only the root bus IRQ routing table. Fail only if that is not
  present.
---

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 004ddcae2..3a630ccef 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1856,7 +1856,7 @@ PRIVATE void acpi_map_bridge(unsigned pbnr, unsigned dev, unsigned sbnr)
 		panic("PCI: error %d while receiveing from ACPI\n", err);
 
 	if (((struct acpi_map_bridge_resp *)&m)->err != OK)
-		panic("PCI: acpi failed to map pci (%d) to pci (%d) bridge\n",
+		printf("PCI: acpi failed to map pci (%d) to pci (%d) bridge\n",
 								pbnr, sbnr);
 }