diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2010-01-01 07:06:28 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2010-01-01 07:06:28 +0000 |
| commit | f197a60c615a3d784e1f75b9c78997bc444fe47c (patch) | |
| tree | 833b5fd77072183bcfbbeb88650a5baf7280dcd4 | |
| parent | 5900c6543558ee94911c2728f48107bd62ed11ce (diff) | |
deck chair shuffling
| -rw-r--r-- | sys/scsi/scsi_base.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 149a99ac7d4..3b70483db52 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.148 2010/01/01 06:30:27 dlg Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.149 2010/01/01 07:06:27 dlg Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -708,7 +708,6 @@ scsi_report_luns(struct scsi_link *sc_link, int selectreport, void scsi_xs_exec(struct scsi_xfer *xs) { - int rv; int s; xs->flags &= ~ITSDONE; @@ -731,8 +730,7 @@ scsi_xs_exec(struct scsi_xfer *xs) * In those cases we must call scsi_done() for it. */ - rv = xs->sc_link->adapter->scsi_cmd(xs); - if (rv == NO_CCB) { + if (xs->sc_link->adapter->scsi_cmd(xs) == NO_CCB) { /* * Give the xs back to the device driver to retry on its own. */ @@ -742,10 +740,6 @@ scsi_xs_exec(struct scsi_xfer *xs) scsi_done(xs); splx(s); } - - /* - * The adapter has called or will call scsi_done(). - */ } /* |