PERFORCE change 169717 for review

[Alexander Motin]

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

Change 169717 by mav at mav_mavbook on 2009/10/23 14:19:07

	Fix mismerge.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#48 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_da.c#48 (text+ko) ====

@@ -813,6 +813,7 @@
 
 	cam_periph_lock(periph);
 
+	/*
 	 * If the device has been made invalid, error out
 	 */
 	if ((softc->flags & DA_FLAG_PACK_INVALID)) {