From f5db59f9d606c9ac2d9060c65fd4d5c06db2fb4e Mon Sep 17 00:00:00 2001 From: "Justin T. Gibbs" Date: Mon, 23 Jun 2003 22:06:34 +0000 Subject: [PATCH] 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. --- sys/dev/aic7xxx/aic79xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index e43a75b8ec2..4e42413cc38 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)