CVS commit: [netbsd-8] src/sys/dev/hpc

2019-10-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 24 15:51:28 UTC 2019

Modified Files:
src/sys/dev/hpc [netbsd-8]: hpcapm.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1412):

sys/dev/hpc/hpcapm.c: revision 1.21

spl leak, found by Mootja


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.22.1 src/sys/dev/hpc/hpcapm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: [netbsd-8] src/sys/dev/hpc

2019-10-24 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Thu Oct 24 15:51:28 UTC 2019

Modified Files:
src/sys/dev/hpc [netbsd-8]: hpcapm.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1412):

sys/dev/hpc/hpcapm.c: revision 1.21

spl leak, found by Mootja


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.22.1 src/sys/dev/hpc/hpcapm.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/dev/hpc/hpcapm.c
diff -u src/sys/dev/hpc/hpcapm.c:1.20 src/sys/dev/hpc/hpcapm.c:1.20.22.1
--- src/sys/dev/hpc/hpcapm.c:1.20	Sat Nov  9 21:31:56 2013
+++ src/sys/dev/hpc/hpcapm.c	Thu Oct 24 15:51:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpcapm.c,v 1.20 2013/11/09 21:31:56 christos Exp $	*/
+/*	$NetBSD: hpcapm.c,v 1.20.22.1 2019/10/24 15:51:28 martin Exp $	*/
 
 /*
  * Copyright (c) 2000 Takemura Shin
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.20 2013/11/09 21:31:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpcapm.c,v 1.20.22.1 2019/10/24 15:51:28 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_hpcapm.h"
@@ -415,6 +415,8 @@ hpcapm_get_event(void *scx, u_int *event
 sc->power_state = APM_SYS_READY;
 			} else
 *event_info = 0;
+			splx(s);
+
 			return (0);
 		}
 	}