diff options
| author |   dlg <dlg@openbsd.org> | 2010-01-07 11:03:37 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2010-01-07 11:03:37 +0000 |
| commit | b91fe72303e17e38e942e82b0fbe3d68045b9487 (patch) | |
| tree | e1389130ab0ae079007e17938217e7b76ee0a3a9 | |
| parent | CISS_UNLOCK before returning from the scsi_cmd handler when we hit NO_CCB. (diff) | |
| download | wireguard-openbsd-b91fe72303e17e38e942e82b0fbe3d68045b9487.tar.xz wireguard-openbsd-b91fe72303e17e38e942e82b0fbe3d68045b9487.zip | |
dont use the xs in the scsi_cmd routines after calling ciss_cmd, it might
have been completed. the xs was used to figure out if we should return
COMPLETED or SUCCESFULLY_QUEUED. the return value doesnt mean anything
anymore, so just return COMPLETE.
| -rw-r--r-- | sys/dev/ic/ciss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index 375d9fb51af..c3bb43404fb 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss.c,v 1.37 2010/01/07 10:58:37 dlg Exp $ */ +/* $OpenBSD: ciss.c,v 1.38 2010/01/07 11:03:37 dlg Exp $ */ /* * Copyright (c) 2005,2006 Michael Shalayeff @@ -923,7 +923,7 @@ ciss_scsi_raw_cmd(struct scsi_xfer *xs) /* TODO */ } CISS_UNLOCK(sc, lock); - return xs->flags & SCSI_POLL? COMPLETE : SUCCESSFULLY_QUEUED; + return (COMPLETE); } int @@ -988,7 +988,7 @@ ciss_scsi_cmd(struct scsi_xfer *xs) } CISS_UNLOCK(sc, lock); - return xs->flags & SCSI_POLL? COMPLETE : SUCCESSFULLY_QUEUED; + return (COMPLETE); } int |