From 4a595144c044c69a673534cc44bf73fc54144be0 Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Sat, 20 Sep 1997 02:29:56 +0000 Subject: [PATCH] ``oops''. I cut/pasted the original free()'s based on mark's suggestion rather than extracting the diff from Mark's patch, but it turns out that I was freeing one allocation twice due to a previous cut/paste braino. My botch, not Mark's. Pointed out by: Mark Valentine --- sys/dev/de/if_de.c | 8 ++++---- sys/pci/if_de.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index c2342e3afa2..7a8d3daa6f2 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.68 1997/09/11 15:27:34 peter Exp $ + * $Id: if_de.c,v 1.69 1997/09/18 08:28:23 peter Exp $ * */ @@ -5057,8 +5057,8 @@ tulip_pci_attach( if (sc->tulip_rxdescs == NULL || sc->tulip_txdescs == NULL) { if (sc->tulip_rxdescs) free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); - if (sc->tulip_rxdescs) - free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); + if (sc->tulip_txdescs) + free((caddr_t) sc->tulip_txdescs, M_DEVBUF); free((caddr_t) sc, M_DEVBUF); return; } @@ -5126,7 +5126,7 @@ tulip_pci_attach( #endif if (!retval) { free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); - free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); + free((caddr_t) sc->tulip_txdescs, M_DEVBUF); free((caddr_t) sc, M_DEVBUF); return; } diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index c2342e3afa2..7a8d3daa6f2 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.68 1997/09/11 15:27:34 peter Exp $ + * $Id: if_de.c,v 1.69 1997/09/18 08:28:23 peter Exp $ * */ @@ -5057,8 +5057,8 @@ tulip_pci_attach( if (sc->tulip_rxdescs == NULL || sc->tulip_txdescs == NULL) { if (sc->tulip_rxdescs) free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); - if (sc->tulip_rxdescs) - free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); + if (sc->tulip_txdescs) + free((caddr_t) sc->tulip_txdescs, M_DEVBUF); free((caddr_t) sc, M_DEVBUF); return; } @@ -5126,7 +5126,7 @@ tulip_pci_attach( #endif if (!retval) { free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); - free((caddr_t) sc->tulip_rxdescs, M_DEVBUF); + free((caddr_t) sc->tulip_txdescs, M_DEVBUF); free((caddr_t) sc, M_DEVBUF); return; }