From 925c0d68049905e28feda5fa3b5ee892418d203b Mon Sep 17 00:00:00 2001 From: Noriaki Mitsunaga Date: Tue, 2 Jan 2001 10:41:50 +0000 Subject: [PATCH] Remove conflicts between unsinged char *s and int s. It was possible cause of kernel panic. Pointed Out by: phk@FreeBSD.ORG --- sys/dev/nsp/nsp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c index c2b67627851..375c8381e94 100644 --- a/sys/dev/nsp/nsp.c +++ b/sys/dev/nsp/nsp.c @@ -880,7 +880,7 @@ nsp_negate_signal(sc, mask, s) bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; int tout = 0; - int s; + int ss; #ifdef __FreeBSD__ struct callout_handle ch; #endif @@ -899,16 +899,16 @@ nsp_negate_signal(sc, mask, s) } while ((regv & mask) != 0 && tout == 0); - s = splhigh(); + ss = splhigh(); if (tout == 0) { #ifdef __FreeBSD__ untimeout(settimeout, &tout, ch); #else untimeout(settimeout, &tout); #endif - splx(s); + splx(ss); } else { - splx(s); + splx(ss); printf("%s: %s singla off timeout \n", slp->sl_xname, s); }