summaryrefslogtreecommitdiffstats
path: root/sys/cam
diff options
context:
space:
mode:
authorken <ken@FreeBSD.org>2016-02-19 17:14:34 +0000
committerken <ken@FreeBSD.org>2016-02-19 17:14:34 +0000
commit89c964ed8efbe4d9432db4b4e63ffe2a7e9f53b2 (patch)
treee70020931aaa1699793f4613def732e25f3158eb /sys/cam
parent427bb5d10fd29ef038c6a4f6df3160e9c77f1b24 (diff)
downloadFreeBSD-src-89c964ed8efbe4d9432db4b4e63ffe2a7e9f53b2.zip
FreeBSD-src-89c964ed8efbe4d9432db4b4e63ffe2a7e9f53b2.tar.gz
MFC, r295417:
r295417 | ken | 2016-02-08 15:13:08 -0700 (Mon, 08 Feb 2016) | 9 lines Fix the SCSI Extended INQUIRY probe case when an error is returned and a retry is scheduled. Instead of leaving the device queue frozen, unfreeze the device queue so that the retry can happen. Sponsored by: Spectra Logic Approved by: re (gjb)
Diffstat (limited to 'sys/cam')
-rw-r--r--sys/cam/scsi/scsi_xpt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index 767aa0d..1af8143 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -1521,7 +1521,7 @@ out:
} else if (cam_periph_error(done_ccb, 0,
SF_RETRY_UA,
&softc->saved_ccb) == ERESTART) {
- return;
+ goto outr;
} else if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) {
/* Don't wedge the queue */
xpt_release_devq(done_ccb->ccb_h.path, /*count*/1,
OpenPOWER on IntegriCloud