d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove conflicts between unsinged char *s and int s.

Browse Source 
It was possible cause of kernel panic.

Pointed Out by: phk@FreeBSD.ORG
This commit is contained in:
non 2000-12-08 13:50:20 +00:00
parent 01e84d045f
commit 0b006e1592
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/stg/tmc18c30.c
View File

@ -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;
}