summaryrefslogtreecommitdiffstats
path: root/sys/pci/pci.c
diff options
context:
space:
mode:
authordg <dg@FreeBSD.org>1995-10-02 13:43:11 +0000
committerdg <dg@FreeBSD.org>1995-10-02 13:43:11 +0000
commitf425fbd3711a5dfc8946b9b0c75ff0aa00ad654c (patch)
tree6bc6dfa4d72aa05ea8743a890ceaca0ff0a7b6c3 /sys/pci/pci.c
parent68cca29cecc0fd665275b3de1f8690ebba456b33 (diff)
downloadFreeBSD-src-f425fbd3711a5dfc8946b9b0c75ff0aa00ad654c.zip
FreeBSD-src-f425fbd3711a5dfc8946b9b0c75ff0aa00ad654c.tar.gz
Fixed bug where wrong thing was being checked for NULL before calling
free(), resulting in a panic. This happend whenever an irq had already been allocated by another device (like something on the ISA bus).
Diffstat (limited to 'sys/pci/pci.c')
-rw-r--r--sys/pci/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 5d9a6df..50337e5 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** $Id: pci.c,v 1.30 1995/09/14 13:09:40 se Exp $
+** $Id: pci.c,v 1.31 1995/09/14 23:24:29 se Exp $
**
** General subroutines for the PCI bus.
** pci_configure ()
@@ -1369,7 +1369,7 @@ fail:
** If included in mask, remove it.
*/
- if (free) free (new, M_DEVBUF);
+ if (new) free(new, M_DEVBUF);
if (!mdp) (void) pcibus->pb_imaskexc (irq, maskptr);
splx (oldspl);
return (0);
OpenPOWER on IntegriCloud