Module Name: src
Committed By: dholland
Date: Sun Aug 30 04:17:48 UTC 2015
Modified Files:
src/sys/dev/ic: gem.c
Log Message:
Restore interrupts on error path. From maxv's brainy list.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/dev/ic/gem.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/gem.c
diff -u src/sys/dev/ic/gem.c:1.102 src/sys/dev/ic/gem.c:1.103
--- src/sys/dev/ic/gem.c:1.102 Sun Aug 10 16:44:35 2014
+++ src/sys/dev/ic/gem.c Sun Aug 30 04:17:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.102 2014/08/10 16:44:35 tls Exp $ */
+/* $NetBSD: gem.c,v 1.103 2015/08/30 04:17:48 dholland Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.102 2014/08/10 16:44:35 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.103 2015/08/30 04:17:48 dholland Exp $");
#include "opt_inet.h"
@@ -1149,8 +1149,10 @@ gem_init(struct ifnet *ifp)
(*sc->sc_hwreset)(sc);
/* step 3. Setup data structures in host memory */
- if (gem_meminit(sc) != 0)
+ if (gem_meminit(sc) != 0) {
+ splx(s);
return 1;
+ }
/* step 4. TX MAC registers & counters */
gem_init_regs(sc);
