Module Name: src
Committed By: snj
Date: Tue Jul 25 02:08:31 UTC 2017
Modified Files:
src/sys/dev/ic [netbsd-8]: rt2860.c
Log Message:
Pull up following revision(s) (requested by maya in ticket #150):
sys/dev/ic/rt2860.c: revision 1.27
Use kmem_free for kmem_alloc'd memory
Fixes diagnostic crash on detach, tested by Riccardo Mottola
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/sys/dev/ic/rt2860.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.26 src/sys/dev/ic/rt2860.c:1.26.2.1
--- src/sys/dev/ic/rt2860.c:1.26 Tue May 23 02:19:14 2017
+++ src/sys/dev/ic/rt2860.c Tue Jul 25 02:08:31 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rt2860.c,v 1.26 2017/05/23 02:19:14 ozaki-r Exp $ */
+/* $NetBSD: rt2860.c,v 1.26.2.1 2017/07/25 02:08:31 snj Exp $ */
/* $OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $ */
/* $FreeBSD: head/sys/dev/ral/rt2860.c 306591 2016-10-02 20:35:55Z avos $ */
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.26 2017/05/23 02:19:14 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.26.2.1 2017/07/25 02:08:31 snj Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -466,7 +466,7 @@ rt2860_detach(void *xsc)
}
if (sc->ucode != NULL)
- free(sc->ucode, M_DEVBUF);
+ firmware_free(sc->ucode, sc->ucsize);
return 0;
}