diff options
| author | Noriaki Mitsunaga <non@FreeBSD.org> | 2001-01-02 10:41:50 +0000 |
|---|---|---|
| committer | Noriaki Mitsunaga <non@FreeBSD.org> | 2001-01-02 10:41:50 +0000 |
| commit | 925c0d68049905e28feda5fa3b5ee892418d203b (patch) | |
| tree | 6f0394907f19bb85a74d5172e1271c90785eda64 /sys/dev/nsp | |
| parent | 7f9cb018930add7afe9eaa7266314692075af403 (diff) | |
| download | src-925c0d68049905e28feda5fa3b5ee892418d203b.tar.gz src-925c0d68049905e28feda5fa3b5ee892418d203b.zip | |
Remove conflicts between unsinged char *s and int s.
It was possible cause of kernel panic.
Pointed Out by: phk@FreeBSD.ORG
Notes
Notes:
svn path=/head/; revision=70597
Diffstat (limited to 'sys/dev/nsp')
| -rw-r--r-- | sys/dev/nsp/nsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c index c2b676278513..375c8381e94b 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); } |