[src/trunk]: src/sys/dev/ic Even if the "card went away", don't return from s...

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

details:   https://anonhg.NetBSD.org/src/rev/a445fbb799ec
branches:  trunk
changeset: 810418:a445fbb799ec
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Aug 30 04:11:40 2015 +0000

description:
Even if the "card went away", don't return from smc91cxx_init without
restoring interrupts. From maxv's brainy list.

diffstat:

 sys/dev/ic/smc91cxx.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 5ee244609cda -r a445fbb799ec sys/dev/ic/smc91cxx.c
--- a/sys/dev/ic/smc91cxx.c     Sun Aug 30 04:09:21 2015 +0000
+++ b/sys/dev/ic/smc91cxx.c     Sun Aug 30 04:11:40 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: smc91cxx.c,v 1.89 2015/04/13 16:33:24 riastradh Exp $  */
+/*     $NetBSD: smc91cxx.c,v 1.90 2015/08/30 04:11:40 dholland Exp $   */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.89 2015/04/13 16:33:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.90 2015/08/30 04:11:40 dholland Exp $");
 
 #include "opt_inet.h"
 
@@ -524,8 +524,11 @@
        sc->sc_txpacketno = ARR_FAILED;
        for (;;) {
                tmp = bus_space_read_2(bst, bsh, MMU_CMD_REG_W);
-               if (tmp == 0xffff)      /* card went away! */
+               if (tmp == 0xffff) {
+                       /* card went away! */
+                       splx(s);
                        return;
+               }
                if ((tmp & MMUCR_BUSY) == 0)
                        break;
        }