diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-03 17:13:23 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2005-12-03 17:13:23 +0000 |
| commit | b1ebc44477794b7e2189d2bc0b2251eb10230ff4 (patch) | |
| tree | 05d7eaa8278a4f3edfdbeb19511e559e622baadb | |
| parent | 953d3f75b51d811736897194878c6363e583653a (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.
| -rw-r--r-- | sys/dev/eisa/aha1742.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/aha.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/seagate.c | 3 | ||||
| -rw-r--r-- | sys/dev/isa/wds.c | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c index 463f5f11b1b..859dba59b1a 100644 --- a/sys/dev/eisa/aha1742.c +++ b/sys/dev/eisa/aha1742.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha1742.c,v 1.20 2005/02/17 18:07:36 jfb Exp $ */ +/* $OpenBSD: aha1742.c,v 1.21 2005/12/03 17:13:22 krw Exp $ */ /* $NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $ */ /* @@ -959,7 +959,6 @@ ahb_scsi_cmd(xs) xs->flags &= ~ITSDONE; } if ((ecb = ahb_get_ecb(sc, flags)) == NULL) { - xs->error = XS_DRIVER_STUFFUP; return TRY_AGAIN_LATER; } ecb->xs = xs; diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index a61279dd3e9..3167d419773 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.54 2005/11/23 11:30:14 mickey Exp $ */ +/* $OpenBSD: aha.c,v 1.55 2005/12/03 17:13:22 krw Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #undef AHADIAG @@ -1271,7 +1271,6 @@ aha_scsi_cmd(xs) */ flags = xs->flags; if ((ccb = aha_get_ccb(sc, flags)) == NULL) { - xs->error = XS_DRIVER_STUFFUP; return (TRY_AGAIN_LATER); } ccb->xs = xs; diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c index 79b2d307ab0..80e697f7a34 100644 --- a/sys/dev/isa/seagate.c +++ b/sys/dev/isa/seagate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: seagate.c,v 1.18 2004/12/26 21:22:13 miod Exp $ */ +/* $OpenBSD: seagate.c,v 1.19 2005/12/03 17:13:22 krw Exp $ */ /* * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver @@ -555,7 +555,6 @@ sea_scsi_cmd(xs) xs->flags &= ~ITSDONE; } if ((scb = sea_get_scb(sea, flags)) == NULL) { - xs->error = XS_DRIVER_STUFFUP; return TRY_AGAIN_LATER; } scb->flags = SCB_ACTIVE; diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c index 074b2804a2f..5bba55c5b41 100644 --- a/sys/dev/isa/wds.c +++ b/sys/dev/isa/wds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wds.c,v 1.21 2005/11/23 11:30:14 mickey Exp $ */ +/* $OpenBSD: wds.c,v 1.22 2005/12/03 17:13:22 krw Exp $ */ /* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */ #undef WDSDIAG @@ -1075,7 +1075,6 @@ wds_scsi_cmd(xs) mflags = ISADMA_MAP_BOUNCE | ISADMA_MAP_WAITOK; #endif if ((scb = wds_get_scb(sc, flags, NEEDBUFFER(sc))) == NULL) { - xs->error = XS_DRIVER_STUFFUP; return TRY_AGAIN_LATER; } scb->xs = xs; |