From ee709c2f32da7c12e7fcece8a4f427c64b30ddb4 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Mon, 2 Oct 1995 14:04:33 +0000
Subject: [PATCH] Check for failure to map the interrupt. Not doing so will
 guarantee that the machine will wedge later.

---
 sys/dev/de/if_de.c | 11 ++++++++---
 sys/pci/if_de.c    | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 96833118f2c..6c352b916a4 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.30 1995/06/28 05:46:19 davidg Exp $
+ * $Id: if_de.c,v 1.31 1995/09/29 19:52:10 davidg Exp $
  *
  */
 
@@ -2514,8 +2514,13 @@ tulip_pci_attach(
 		   sc->tulip_name, sc->tulip_unit);
 #endif
 #if defined(__FreeBSD__)
-	if (sc->tulip_boardsw->bd_type != TULIP_DC21040_ZX314_SLAVE)
-	    pci_map_int (config_id, tulip_intr, (void*) sc, &net_imask);
+	if (sc->tulip_boardsw->bd_type != TULIP_DC21040_ZX314_SLAVE) {
+	    if (!pci_map_int(config_id, tulip_intr, (void*) sc, &net_imask)) {
+		printf("%s%d: couldn't map interrupt\n",
+			sc->tulip_name, sc->tulip_unit);
+		return;
+	    }
+	}
 #endif
 #if defined(__bsdi__)
 	if (sc->tulip_boardsw->bd_type != TULIP_DC21040_ZX314_SLAVE) {
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 96833118f2c..6c352b916a4 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.30 1995/06/28 05:46:19 davidg Exp $
+ * $Id: if_de.c,v 1.31 1995/09/29 19:52:10 davidg Exp $
  *
  */
 
@@ -2514,8 +2514,13 @@ tulip_pci_attach(
 		   sc->tulip_name, sc->tulip_unit);
 #endif
 #if defined(__FreeBSD__)
-	if (sc->tulip_boardsw->bd_type != TULIP_DC21040_ZX314_SLAVE)
-	    pci_map_int (config_id, tulip_intr, (void*) sc, &net_imask);
+	if (sc->tulip_boardsw->bd_type != TULIP_DC21040_ZX314_SLAVE) {
+	    if (!pci_map_int(config_id, tulip_intr, (void*) sc, &net_imask)) {
+		printf("%s%d: couldn't map interrupt\n",
+			sc->tulip_name, sc->tulip_unit);
+		return;
+	    }
+	}
 #endif
 #if defined(__bsdi__)
 	if (sc->tulip_boardsw->bd_type != TULIP_DC21040_ZX314_SLAVE) {