Module Name: src
Committed By: dholland
Date: Sun Aug 30 04:16:18 UTC 2015
Modified Files:
src/sys/arch/acorn26/ioc: arcpp.c
Log Message:
Restore interrupts on error paths. From maxv's brainy list.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/acorn26/ioc/arcpp.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/arch/acorn26/ioc/arcpp.c
diff -u src/sys/arch/acorn26/ioc/arcpp.c:1.14 src/sys/arch/acorn26/ioc/arcpp.c:1.15
--- src/sys/arch/acorn26/ioc/arcpp.c:1.14 Fri Jul 25 08:10:31 2014
+++ src/sys/arch/acorn26/ioc/arcpp.c Sun Aug 30 04:16:18 2015
@@ -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 @@ arcppopen(dev_t dev, int flag, int mode,
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;
}
