diff options
| author |   mikeb <mikeb@openbsd.org> | 2012-05-14 14:17:30 +0000 |
|---|---|---|
| committer | mikeb <mikeb@openbsd.org> | 2012-05-14 14:17:30 +0000 |
| commit | e77ae54cb4fbed487a7718a83a8f1e78ff9b9540 (patch) | |
| tree | c1db79ecb9473bbc5849848e570c49f5d2e60504 | |
| parent | Don't display a nonsense uptime for an inactive interface. ldpd fix from (diff) | |
| download | wireguard-openbsd-e77ae54cb4fbed487a7718a83a8f1e78ff9b9540.tar.xz wireguard-openbsd-e77ae54cb4fbed487a7718a83a8f1e78ff9b9540.zip | |
fixup "couldn't establish interrupt" error printf; from brad, ok phessler
| -rw-r--r-- | sys/dev/pci/if_bnx.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/pci/if_bnx.c b/sys/dev/pci/if_bnx.c index c92e471f58e..ccf374bc6b6 100644 --- a/sys/dev/pci/if_bnx.c +++ b/sys/dev/pci/if_bnx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bnx.c,v 1.95 2011/06/22 16:44:27 tedu Exp $ */ +/* $OpenBSD: if_bnx.c,v 1.96 2012/05/14 14:17:30 mikeb Exp $ */ /*- * Copyright (c) 2006 Broadcom Corporation @@ -748,17 +748,19 @@ bnx_attach(struct device *parent, struct device *self, void *aux) if (val & BNX_PCICFG_MISC_STATUS_32BIT_DET) sc->bnx_flags |= BNX_PCI_32BIT_FLAG; - printf(": %s\n", intrstr); - /* Hookup IRQ last. */ sc->bnx_intrhand = pci_intr_establish(pc, sc->bnx_ih, IPL_NET, bnx_intr, sc, sc->bnx_dev.dv_xname); if (sc->bnx_intrhand == NULL) { - printf("%s: couldn't establish interrupt\n", - sc->bnx_dev.dv_xname); + printf(": couldn't establish interrupt"); + if (intrstr != NULL) + printf(" at %s", intrstr); + printf("\n"); goto bnx_attach_fail; } + printf(": %s\n", intrstr); + mountroothook_establish(bnx_attachhook, sc); return; |