summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgibbs <gibbs@FreeBSD.org>2003-06-23 22:06:34 +0000
committergibbs <gibbs@FreeBSD.org>2003-06-23 22:06:34 +0000
commita1fca12a50290289d2e3e07795745e4879555a37 (patch)
tree40dc6d86c5e48be40bfa05d17357730690845b98
parentf0c290220a0d322d22ab9ae7f6fc24164ad033d0 (diff)
downloadFreeBSD-src-a1fca12a50290289d2e3e07795745e4879555a37.zip
FreeBSD-src-a1fca12a50290289d2e3e07795745e4879555a37.tar.gz
Add parenthesis so that we get all of the bits all
of the contents of the CCSCBCTL register into our local varaible. The other bits are used in later tests. This avoids a potential deadlock in ahd_run_qoutfifo() if we happen to catch the DMA engine in just the right state.
-rw-r--r--sys/dev/aic7xxx/aic79xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index e43a75b..4e42413 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -37,7 +37,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#198 $
+ * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#199 $
*
* $FreeBSD$
*/
@@ -378,7 +378,7 @@ ahd_flush_qoutfifo(struct ahd_softc *ahd)
* Wait for any inprogress DMA to complete and clear DMA state
* if this if for an SCB in the qinfifo.
*/
- while ((ccscbctl = ahd_inb(ahd, CCSCBCTL) & (CCARREN|CCSCBEN)) != 0) {
+ while (((ccscbctl = ahd_inb(ahd, CCSCBCTL)) & (CCARREN|CCSCBEN)) != 0) {
if ((ccscbctl & (CCSCBDIR|CCARREN)) == (CCSCBDIR|CCARREN)) {
if ((ccscbctl & ARRDONE) != 0)
OpenPOWER on IntegriCloud