[src/trunk]: src/sys/arch/acorn26/ioc Restore interrupts on error paths. From...

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

details:   https://anonhg.NetBSD.org/src/rev/8ca767be90ed
branches:  trunk
changeset: 340277:8ca767be90ed
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Aug 30 04:16:18 2015 +0000

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

diffstat:

 sys/arch/acorn26/ioc/arcpp.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 19b2a51ecebe -r 8ca767be90ed sys/arch/acorn26/ioc/arcpp.c
--- a/sys/arch/acorn26/ioc/arcpp.c      Sun Aug 30 04:11:40 2015 +0000
+++ b/sys/arch/acorn26/ioc/arcpp.c      Sun Aug 30 04:16:18 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: arcpp.c,v 1.14 2014/07/25 08:10:31 dholland Exp $ */
+/* $NetBSD: arcpp.c,v 1.15 2015/08/30 04:16:18 dholland Exp $ */
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -52,7 +52,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.14 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.15 2015/08/30 04:16:18 dholland Exp $");
 
 #include <sys/conf.h>
 #include <sys/device.h>
@@ -217,10 +217,12 @@
        error = tsleep((void *)sc, ARCPPPRI | PCATCH, "arcppopen", TIMEOUT);
        if (error == EWOULDBLOCK) {
                sc->sc_state = 0;
+               splx(s);
                return EBUSY;
        }
        if (error) {
                sc->sc_state = 0;
+               splx(s);
                return error;
        }