diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-03 16:53:17 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-03 16:53:17 +0000 |
| commit | 59413aaf9936ee396905effecb9206e3e5d9e01f (patch) | |
| tree | d820a69874e8e867417c8c87fff410362b921e48 /sys/dev/ic/siop.c | |
| parent | 734d8d431c424e5467db4143f21b9249f5900059 (diff) | |
The first thing done when XXX_scsi_cmd() returns TRY_AGAIN_LATER is
to set xs->error to XS_BUSY. So it is pointless and misleading to
set xs->error to XS_TIMEOUT, XS_DRIVER_STUFFUP or XS_BUSY just before
returning TRY_AGAIN_LATER.
No functional change.
Diffstat (limited to 'sys/dev/ic/siop.c')
| -rw-r--r-- | sys/dev/ic/siop.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index c0dc9a6ed84..b7a510fc3b0 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.42 2005/11/20 22:32:48 krw Exp $ */ +/* $OpenBSD: siop.c,v 1.43 2005/12/03 16:53:16 krw Exp $ */ /* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */ /* @@ -1356,7 +1356,6 @@ siop_scsicmd(xs) #endif siop_cmd = TAILQ_FIRST(&sc->free_list); if (siop_cmd == NULL) { - xs->error = XS_DRIVER_STUFFUP; splx(s); return(TRY_AGAIN_LATER); } @@ -1382,7 +1381,6 @@ siop_scsicmd(xs) printf("%s: can't malloc memory for " "target %d\n", sc->sc_c.sc_dev.dv_xname, target); - xs->error = XS_DRIVER_STUFFUP; splx(s); return(TRY_AGAIN_LATER); } @@ -1401,7 +1399,6 @@ siop_scsicmd(xs) if (siop_target->lunsw == NULL) { printf("%s: can't alloc lunsw for target %d\n", sc->sc_c.sc_dev.dv_xname, target); - xs->error = XS_DRIVER_STUFFUP; splx(s); return(TRY_AGAIN_LATER); } @@ -1417,7 +1414,6 @@ siop_scsicmd(xs) printf("%s: can't alloc siop_lun for " "target %d lun %d\n", sc->sc_c.sc_dev.dv_xname, target, lun); - xs->error = XS_DRIVER_STUFFUP; splx(s); return(TRY_AGAIN_LATER); } @@ -1443,7 +1439,6 @@ siop_scsicmd(xs) if (error) { printf("%s: unable to load data DMA map: %d\n", sc->sc_c.sc_dev.dv_xname, error); - xs->error = XS_DRIVER_STUFFUP; splx(s); return(TRY_AGAIN_LATER); } |