summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoriaki Mitsunaga <non@FreeBSD.org>2000-12-08 13:50:20 +0000
committerNoriaki Mitsunaga <non@FreeBSD.org>2000-12-08 13:50:20 +0000
commite3f875caffc3e3e5d9032a7b2adea7aa17f482cc (patch)
treedfc3eab794e122b5cb0a26d3b3b45a95354657b1
parent5e469ffaee22d61fb7def566b6cb83c2bbda9c80 (diff)
Notes
-rw-r--r--sys/dev/stg/tmc18c30.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/stg/tmc18c30.c b/sys/dev/stg/tmc18c30.c
index dbfe5679ae96..b84d5b9198ed 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;
}