diff options
| author | non <non@FreeBSD.org> | 2000-12-08 13:50:20 +0000 |
|---|---|---|
| committer | non <non@FreeBSD.org> | 2000-12-08 13:50:20 +0000 |
| commit | 0b006e1592bdf4d5125ac5c418594a719e56d04e (patch) | |
| tree | 7cb835a19f2051af8b0e4f89d3bf9e3af88fab1b /sys/dev | |
| parent | 01e84d045faaf24442cb768e1b1f266258eecb4a (diff) | |
| download | FreeBSD-src-0b006e1592bdf4d5125ac5c418594a719e56d04e.zip FreeBSD-src-0b006e1592bdf4d5125ac5c418594a719e56d04e.tar.gz | |
Remove conflicts between unsinged char *s and int s.
It was possible cause of kernel panic.
Pointed Out by: phk@FreeBSD.ORG
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/stg/tmc18c30.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c index dbfe567..b84d5b9 100644 --- a/sys/dev/stg/tmc18c30.c +++ b/sys/dev/stg/tmc18c30.c @@ -668,7 +668,7 @@ stg_negate_signal(sc, mask, s) struct scsi_low_softc *slp = &sc->sc_sclow; bus_space_tag_t bst = sc->sc_iot; bus_space_handle_t bsh = sc->sc_ioh; - int s; + int ss; int tout = 0; #ifdef __FreeBSD__ struct callout_handle ch; @@ -684,7 +684,7 @@ stg_negate_signal(sc, mask, s) { regv = bus_space_read_1(bst, bsh, tmc_bstat); if (regv == 0xff) { - s = splhigh(); + ss = splhigh(); if (tout == 0) { #ifdef __FreeBSD__ untimeout(settimeout, &tout, ch); @@ -692,22 +692,22 @@ stg_negate_signal(sc, mask, s) untimeout(settimeout, &tout); #endif } - splx(s); + splx(ss); return EIO; } } 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 singal off timeout \n", slp->sl_xname, s); return EIO; } |
