svn commit: r188362 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/msk

[Pyun YongHyeon]

Author: yongari
Date: Mon Feb  9 02:03:49 2009
New Revision: 188362
URL: http://svn.freebsd.org/changeset/base/188362

Log:
  MFC r185244
    Save the value read from TX queue CSR, so we don't test against a
    stale one.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/dev/msk/if_msk.c

Modified: stable/7/sys/dev/msk/if_msk.c
==============================================================================
--- stable/7/sys/dev/msk/if_msk.c	Mon Feb  9 02:00:43 2009	(r188361)
+++ stable/7/sys/dev/msk/if_msk.c	Mon Feb  9 02:03:49 2009	(r188362)
@@ -3966,7 +3966,7 @@ msk_stop(struct msk_if_softc *sc_if)
 		if ((val & (BMU_STOP | BMU_IDLE)) == 0) {
 			CSR_WRITE_4(sc, Q_ADDR(sc_if->msk_txq, Q_CSR),
 			    BMU_STOP);
-			CSR_READ_4(sc, Q_ADDR(sc_if->msk_txq, Q_CSR));
+			val = CSR_READ_4(sc, Q_ADDR(sc_if->msk_txq, Q_CSR));
 		} else
 			break;
 		DELAY(1);