[src/netbsd-3-0]: src/sys/dev/ieee1394 Apply patch (requested by christos in ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/74e031fcdb7d
branches:  netbsd-3-0
changeset: 579447:74e031fcdb7d
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Sep 09 21:36:46 2007 +0000

description:
Apply patch (requested by christos in ticket #1835):
        sys/dev/ieee1394/fwohci.c:      patch
PR kern/36945 by Ross Philipson: Remove call to fwohci_desc_put() in an error
path where fwohci_desc_get() has not been called yet.

diffstat:

 sys/dev/ieee1394/fwohci.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 5b6bf4d49d3d -r 74e031fcdb7d sys/dev/ieee1394/fwohci.c
--- a/sys/dev/ieee1394/fwohci.c Tue Aug 28 13:53:18 2007 +0000
+++ b/sys/dev/ieee1394/fwohci.c Sun Sep 09 21:36:46 2007 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fwohci.c,v 1.84 2005/02/27 00:27:17 perry Exp $        */
+/*     $NetBSD: fwohci.c,v 1.84.4.1 2007/09/09 21:36:46 bouyer Exp $   */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.84 2005/02/27 00:27:17 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.84.4.1 2007/09/09 21:36:46 bouyer Exp $");
 
 #define FWOHCI_WAIT_DEBUG 1
 
@@ -2440,7 +2440,6 @@
                if ((error = bus_dmamap_create(sc->sc_dmat, pkt->fp_dlen,
                    OHCI_DESC_MAX - 2, pkt->fp_dlen, 0, BUS_DMA_WAITOK,
                    &fb->fb_dmamap)) != 0) {
-                       fwohci_desc_put(sc, fb->fb_desc, ndesc);
                        free(fb, M_DEVBUF);
                        return error;
                }
@@ -2454,7 +2453,6 @@
                if (error != 0) {
                        DPRINTFN(1, ("Can't load DMA map: %d\n", error));
                        bus_dmamap_destroy(sc->sc_dmat, fb->fb_dmamap);
-                       fwohci_desc_put(sc, fb->fb_desc, ndesc);
                        free(fb, M_DEVBUF);
                        return error;
                }