From: jsg <jsg@openbsd.org>
Date: Fri, 15 May 2015 13:32:08 +0000 (+0000)
Subject: add some missing splx() calls
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=a8b2c029b889f2d77ce04c349c9616448463b834;p=openbsd

add some missing splx() calls
ok deraadt@ kettenis@ krw@
---

diff --git a/sys/arch/arm/xscale/pxa27x_udc.c b/sys/arch/arm/xscale/pxa27x_udc.c
index 0c55121376b..a809141c57a 100644
--- a/sys/arch/arm/xscale/pxa27x_udc.c
+++ b/sys/arch/arm/xscale/pxa27x_udc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa27x_udc.c,v 1.30 2015/05/07 01:55:43 jsg Exp $ */
+/*	$OpenBSD: pxa27x_udc.c,v 1.31 2015/05/15 13:32:08 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
@@ -931,6 +931,7 @@ pxaudc_open(struct usbf_pipe *pipe)
 	if (ep_idx != 0 && sc->sc_ep_map[ep_idx] != -1) {
 		printf("endpoint %d already used by %c",
 		    ep_idx, '@'+ sc->sc_ep_map[0]);
+		splx(s);
 		return USBF_BAD_ADDRESS;
 	}
 	sc->sc_ep_map[ep_idx] = sc->sc_npipe;
diff --git a/sys/dev/hil/hil.c b/sys/dev/hil/hil.c
index 5bab6695a50..44c4aad4743 100644
--- a/sys/dev/hil/hil.c
+++ b/sys/dev/hil/hil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hil.c,v 1.25 2013/11/18 20:21:51 deraadt Exp $	*/
+/*	$OpenBSD: hil.c,v 1.26 2015/05/15 13:32:08 jsg Exp $	*/
 /*
  * Copyright (c) 2003, 2004, Miodrag Vallat.
  * All rights reserved.
@@ -616,6 +616,7 @@ hilempty(struct hil_softc *sc)
 			 * configuration has changed.
 			 */
 			hilconfig(sc, oldmaxdev);
+			splx(s);
 			return;
 		}
 	}