Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic always use correct function to free our copy of t...



details:   https://anonhg.NetBSD.org/src/rev/a01b5fd340a2
branches:  trunk
changeset: 446690:a01b5fd340a2
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Dec 14 20:44:36 2018 +0000

description:
always use correct function to free our copy of the microcode

diffstat:

 sys/dev/ic/malo.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r edbcae69d7c6 -r a01b5fd340a2 sys/dev/ic/malo.c
--- a/sys/dev/ic/malo.c Fri Dec 14 18:17:36 2018 +0000
+++ b/sys/dev/ic/malo.c Fri Dec 14 20:44:36 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: malo.c,v 1.13 2018/09/03 16:29:31 riastradh Exp $ */
+/*     $NetBSD: malo.c,v 1.14 2018/12/14 20:44:36 jakllsch Exp $ */
 /*     $OpenBSD: malo.c,v 1.92 2010/08/27 17:08:00 jsg Exp $ */
 
 /*
@@ -19,7 +19,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.13 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: malo.c,v 1.14 2018/12/14 20:44:36 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -1727,6 +1727,8 @@
        bus_space_write_region_1(sc->sc_mem1_bt, sc->sc_mem1_bh, 0xbf00,
            ucode, size);
 
+       firmware_free(ucode, size);
+
        /*
         * we loaded the firmware into card memory now tell the CPU
         * to fetch the code and execute it. The memory mapped via the
@@ -1743,10 +1745,8 @@
        }
        if (i == 10) {
                aprint_error_dev(sc->sc_dev, "timeout at boot firmware load!\n");
-               free(ucode, M_DEVBUF);
                return (ETIMEDOUT);
        }
-       firmware_free(ucode, size);
 
        /* tell the card we're done and... */
        malo_mem_write2(sc, 0xbef8, 0x001);



Home | Main Index | Thread Index | Old Index