svn commit: r199382 - stable/8/sys/cam

[Alexander Motin]

Author: mav
Date: Tue Nov 17 14:37:20 2009
New Revision: 199382
URL: http://svn.freebsd.org/changeset/base/199382

Log:
  MFC r197421:
  If on sense request device returns no sence, give up and return,
  or we may loop forever.

Modified:
  stable/8/sys/cam/cam_periph.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/cam/cam_periph.c
==============================================================================
--- stable/8/sys/cam/cam_periph.c	Tue Nov 17 14:30:09 2009	(r199381)
+++ stable/8/sys/cam/cam_periph.c	Tue Nov 17 14:37:20 2009	(r199382)
@@ -1034,8 +1034,13 @@ camperiphdone(struct cam_periph *periph,
 					cam_error_print(saved_ccb, CAM_ESF_ALL,
 							CAM_EPF_ALL);
 #endif
-					xpt_done_ccb = TRUE;
+				} else {
+					saved_ccb->ccb_h.status &=
+					    ~CAM_STATUS_MASK;
+					saved_ccb->ccb_h.status |=
+					    CAM_AUTOSENSE_FAIL;
 				}
+				xpt_done_ccb = TRUE;
 			}
 		}
 		bcopy(done_ccb->ccb_h.saved_ccb_ptr, done_ccb,