aboutsummaryrefslogtreecommitdiffstats
path: root/sys/dev/ciss/ciss.c
diff options
context:
space:
mode:
authorPaul Saab <ps@FreeBSD.org>2003-12-12 21:58:42 +0000
committerPaul Saab <ps@FreeBSD.org>2003-12-12 21:58:42 +0000
commit12fd6b2207726f3db5e0dd2b62125feb02e10195 (patch)
treee74ce8980c6b1aa816639b8f8940c18d2341f2d3 /sys/dev/ciss/ciss.c
parent8bb944bbbcae33f315cd010075b86066e4b341a2 (diff)
downloadsrc-12fd6b2207726f3db5e0dd2b62125feb02e10195.tar.gz
src-12fd6b2207726f3db5e0dd2b62125feb02e10195.zip
Fix a mis-merge in ciss_unmap_request and actually unmap a request.
Fir another mis-merge in ciss_cam_action_io when getting an error back from ciss_start, only REQUEUE the request if the error is not EINPROGRESS Pointy hat to: me
Notes
Notes: svn path=/stable/4/; revision=123501
Diffstat (limited to 'sys/dev/ciss/ciss.c')
-rw-r--r--sys/dev/ciss/ciss.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index e94ef6e909c8..e1a084fcb630 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -2074,7 +2074,7 @@ ciss_unmap_request(struct ciss_request *cr)
sc = cr->cr_sc;
/* check that unmapping is necessary */
- if (cr->cr_flags & CISS_REQ_MAPPED)
+ if ((cr->cr_flags & CISS_REQ_MAPPED) == 0)
return;
bus_dmamap_sync(sc->ciss_command_dmat, sc->ciss_command_map,
@@ -2397,7 +2397,6 @@ ciss_cam_action_io(struct cam_sim *sim, struct ccb_scsiio *csio)
*/
if ((error = ciss_start(cr)) != 0) {
xpt_freeze_simq(sc->ciss_cam_sim, 1);
- csio->ccb_h.status |= CAM_REQUEUE_REQ;
if (error == EINPROGRESS) {
csio->ccb_h.status |= CAM_RELEASE_SIMQ;
error = 0;