diff options
| author | smh <smh@FreeBSD.org> | 2014-12-21 03:06:11 +0000 |
|---|---|---|
| committer | smh <smh@FreeBSD.org> | 2014-12-21 03:06:11 +0000 |
| commit | f73f068967977545d4d60b36864475974dca2613 (patch) | |
| tree | 25e0e0aad4faf12d9100173a8b5cb4866ec97cdf /sys/dev/ciss | |
| parent | 4ae371d305e8c60f2e534058d1727f819749b623 (diff) | |
| download | FreeBSD-src-f73f068967977545d4d60b36864475974dca2613.zip FreeBSD-src-f73f068967977545d4d60b36864475974dca2613.tar.gz | |
MFC r274819:
Prevent overflow issues in timeout processing
MFC r274852:
Fix build with asr driver
Sponsored by: Multiplay
Diffstat (limited to 'sys/dev/ciss')
| -rw-r--r-- | sys/dev/ciss/ciss.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 5240051..918385a 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -2414,7 +2414,8 @@ ciss_wait_request(struct ciss_request *cr, int timeout) return(error); while ((cr->cr_flags & CISS_REQ_SLEEP) && (error != EWOULDBLOCK)) { - error = msleep(cr, &cr->cr_sc->ciss_mtx, PRIBIO, "cissREQ", (timeout * hz) / 1000); + error = msleep_sbt(cr, &cr->cr_sc->ciss_mtx, PRIBIO, "cissREQ", + SBT_1MS * timeout, 0, 0); } return(error); } |
