aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jacob <mjacob@FreeBSD.org>2001-07-30 00:44:32 +0000
committerMatt Jacob <mjacob@FreeBSD.org>2001-07-30 00:44:32 +0000
commitc7ec4390401889aabd0b0a9789644fe7d823959e (patch)
treec10c5c5420ad4f75fc77a035cb2677bc9a9aff79
parent387c7c9d0eaf147256a54d803ffbd116af6fcd17 (diff)
Notes
-rw-r--r--sys/cam/cam_periph.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index d74b04daacc47..d93a8424cd3f1 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -493,8 +493,8 @@ cam_periph_lock(struct cam_periph *periph, int priority)
/*
* Increment the reference count on the peripheral
* while we wait for our lock attempt to succeed
- * to ensure the peripheral doesn't dissappear
- * out from under us while we sleep.
+ * to ensure the peripheral doesn't disappear out
+ * from under us while we sleep.
*/
if (cam_periph_acquire(periph) != CAM_REQ_CMP)
return(ENXIO);
@@ -1514,7 +1514,7 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
status = ccb->ccb_h.status;
frozen = (status & CAM_DEV_QFRZN) != 0;
status &= CAM_STATUS_MASK;
- relsim_flags = 0;
+ openings = relsim_flags = 0;
switch (status) {
case CAM_REQ_CMP:
@@ -1532,6 +1532,8 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
case CAM_AUTOSENSE_FAIL:
xpt_print_path(ccb->ccb_h.path);
printf("AutoSense Failed\n");
+ error = EIO; /* we have to kill the command */
+ break;
case CAM_REQ_CMP_ERR:
case CAM_CMD_TIMEOUT:
case CAM_UNEXP_BUSFREE: