Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a couple of cases where we could return without restoring the 

SPL value.  Fixes a problem with the Xserver on A7000 kernels.
This commit is contained in:
rearnsha 2001-03-18 17:00:56 +00:00
parent 614827277d
commit 62dd3b3608
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm32/dev/kbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd.c,v 1.25 2000/03/23 06:35:14 thorpej Exp $ */
/* $NetBSD: kbd.c,v 1.26 2001/03/18 17:00:56 rearnsha Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@ -332,8 +332,10 @@ kbdpoll(dev, events, p)
int revents = 0;
int s = spltty();
if (KBDFLAG(dev) == KBDFLAG_CONUNIT)
if (KBDFLAG(dev) == KBDFLAG_CONUNIT) {
splx(s);
return(ENXIO);
}
if (events & (POLLIN | POLLRDNORM)) {
if (sc->sc_q.c_cc > 0)

10
sys/arch/arm32/dev/pms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pms.c,v 1.21 2000/03/23 06:35:14 thorpej Exp $ */
/* $NetBSD: pms.c,v 1.22 2001/03/18 17:00:56 rearnsha Exp $ */
/*-
* Copyright (c) 1996 D.C. Tsen
@ -421,11 +421,6 @@ pmsioctl(dev, cmd, addr, flag, p)
case MOUSEIOC_SETMODE:
{
struct mousebufrec buffer;
#ifdef MOUSE_IOC_ACK
int s;
s = spltty();
#endif
sc->sc_mode = *(int *)addr;
buffer.status = IOC_ACK;
@ -436,9 +431,8 @@ pmsioctl(dev, cmd, addr, flag, p)
printf("%s: setting mode with non empty buffer (%d)\n",
sc->sc_dev.dv_xname, sc->sc_q.c_cc);
pmsputbuffer(sc, &buffer);
(void)splx(s);
#endif
return 0;
break;
}
case MOUSEIOC_SETORIGIN:
{