PERFORCE change 173319 for review

[Alexander Motin]

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

Change 173319 by mav at mav_mavtest on 2010/01/18 14:48:32

	Do not refetch number of ports on initalization restart.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_pmp.c#29 edit

Differences ...

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

@@ -431,7 +431,7 @@
 	
 	if (softc->restart) {
 		softc->restart = 0;
-		softc->state = PMP_STATE_PORTS;
+		softc->state = min(softc->state, PMP_STATE_PRECONFIG);
 	}
 	/* Fetch user wanted device speed. */
 	if (softc->state == PMP_STATE_RESET ||
@@ -577,7 +577,7 @@
 			xpt_free_ccb(done_ccb);
 		} else
 			xpt_release_ccb(done_ccb);
-		softc->state = PMP_STATE_PORTS;
+		softc->state = min(softc->state, PMP_STATE_PRECONFIG);
 		xpt_schedule(periph, priority);
 		return;
 	}