From 4de2c18f4e05b576d24b4d9569125c5db09a3245 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sun, 20 Feb 2011 20:03:34 +0100
Subject: [PATCH] --- yaml --- r: 236119 b: refs/heads/master c:
 1af4791552e462b37d0174407dc3173917e35ea0 h: refs/heads/master i:   236117:
 c4949c96929d18cc151746bae02ae50564ff893c   236115:
 1a8c84bd2c1cd881fa7e580450ab60b135b30fa8   236111:
 5910231cbeb762057582a7811f3340d11049e8a1 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/staging/et131x/et1310_rx.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ce7e4471eb34..1e8525015cb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f60554cb121b951d250639b01c828cf41aa09da
+refs/heads/master: 1af4791552e462b37d0174407dc3173917e35ea0
diff --git a/trunk/drivers/staging/et131x/et1310_rx.c b/trunk/drivers/staging/et131x/et1310_rx.c
index a87da6848f9c..339136f64be1 100644
--- a/trunk/drivers/staging/et131x/et1310_rx.c
+++ b/trunk/drivers/staging/et131x/et1310_rx.c
@@ -717,10 +717,10 @@ void et131x_rx_dma_disable(struct et131x_adapter *etdev)
 	/* Setup the receive dma configuration register */
 	writel(0x00002001, &etdev->regs->rxdma.csr);
 	csr = readl(&etdev->regs->rxdma.csr);
-	if ((csr & 0x00020000) != 1) {	/* Check halt status (bit 17) */
+	if ((csr & 0x00020000) == 0) {	/* Check halt status (bit 17) */
 		udelay(5);
 		csr = readl(&etdev->regs->rxdma.csr);
-		if ((csr & 0x00020000) != 1)
+		if ((csr & 0x00020000) == 0)
 			dev_err(&etdev->pdev->dev,
 			"RX Dma failed to enter halt state. CSR 0x%08x\n",
 				csr);