summaryrefslogtreecommitdiffstats
path: root/sys/dev/dpt/dpt_scsi.c
diff options
context:
space:
mode:
authoreivind <eivind@FreeBSD.org>1998-06-02 00:32:38 +0000
committereivind <eivind@FreeBSD.org>1998-06-02 00:32:38 +0000
commitf7112550c8685aab298cb3df5ff23d8027c9c23a (patch)
treede4c5529be7ee53f13500f6c8259fe0f395be6ed /sys/dev/dpt/dpt_scsi.c
parentcfe0052eeae642e9ff9c24764d1fd5734a50e93d (diff)
downloadFreeBSD-src-f7112550c8685aab298cb3df5ff23d8027c9c23a.zip
FreeBSD-src-f7112550c8685aab298cb3df5ff23d8027c9c23a.tar.gz
o Return error when the controller can't accept commands.
o Make driver less chatty on boot (only announce version under bootverbose) Submitted by: Simon Shapiro <shimon@simon-shapiro.org>
Diffstat (limited to 'sys/dev/dpt/dpt_scsi.c')
-rw-r--r--sys/dev/dpt/dpt_scsi.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/dev/dpt/dpt_scsi.c b/sys/dev/dpt/dpt_scsi.c
index 38ce29c..5abf2ad 100644
--- a/sys/dev/dpt/dpt_scsi.c
+++ b/sys/dev/dpt/dpt_scsi.c
@@ -64,7 +64,7 @@
* 3. dpt_handle_timeouts potentially inserts into the queue
*/
-#ident "$Id: dpt_scsi.c,v 1.4 1998/02/25 11:56:37 bde Exp $"
+#ident "$Id: dpt_scsi.c,v 1.5 1998/03/11 00:30:08 julian Exp $"
#define _DPT_C_
#include "opt_dpt.h"
@@ -2105,13 +2105,11 @@ dpt_scsi_cmd(struct scsi_xfer * xs)
/* This will setup the xs flags */
dpt_process_completion(dpt, ccb);
- if (status & HA_SERROR) {
- ospl = splsoftcam();
- dpt_Qpush_free(dpt, ccb);
- splx(ospl);
- return (COMPLETE);
- }
ospl = splsoftcam();
+ if ((status & HA_SERROR) || (ndx == xs->timeout)) {
+ xs->error = XS_DRIVER_STUFFUP;
+ }
+
dpt_Qpush_free(dpt, ccb);
splx(ospl);
return (COMPLETE);
OpenPOWER on IntegriCloud