PERFORCE change 169802 for review

[Alexander Motin]

http://p4web.freebsd.org/chv.cgi?CH=169802

Change 169802 by mav at mav_mavtest on 2009/10/25 16:01:26

	Do not forget to release device after ATA_SET_MULTI error.
	Use only lower byte of identify word 47 for max sec/int.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#33 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#33 (text+ko) ====

@@ -645,7 +645,7 @@
 	if (cgd->ident_data.satacapabilities & ATA_SUPPORT_NCQ &&
 	    cgd->ident_data.queue >= 31)
 		softc->flags |= ADA_FLAG_CAN_NCQ;
-	softc->secsperint = max(1, min(cgd->ident_data.sectors_intr, 16));
+	softc->secsperint = max(1, min(cgd->ident_data.sectors_intr & 0xff, 16));
 	softc->state = ADA_STATE_SET_MULTI;
 
 	periph->softc = softc;
@@ -1015,6 +1015,12 @@
 				/* A retry was scheduled, so just return. */
 				return;
 			}
+			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
+				cam_release_devq(done_ccb->ccb_h.path,
+						 /*relsim_flags*/0,
+						 /*reduction*/0,
+						 /*timeout*/0,
+						 /*getcount_only*/0);
 		}
 		softc->state = ADA_STATE_NORMAL;
 		/*