[src/trunk]: src/sys/dev/ic Restore interrupts on error path. From maxv's bra...

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

details:   https://anonhg.NetBSD.org/src/rev/60ebaa84d310
branches:  trunk
changeset: 340278:60ebaa84d310
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Aug 30 04:17:48 2015 +0000

description:
Restore interrupts on error path. From maxv's brainy list.

diffstat:

 sys/dev/ic/gem.c |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 8ca767be90ed -r 60ebaa84d310 sys/dev/ic/gem.c
--- a/sys/dev/ic/gem.c  Sun Aug 30 04:16:18 2015 +0000
+++ b/sys/dev/ic/gem.c  Sun Aug 30 04:17:48 2015 +0000
@@ -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 @@
                (*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);