Commit 1af47915 authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Greg Kroah-Hartman

staging/et131x: fix et131x_rx_dma_disable halt_status usage

Commit 1bd751c1
("Staging: et131x: Clean up rxdma_csr") changed csr from bitfield to
u32, but failed to convert 2 uses of halt_status bit. It did:

- if (csr.bits.halt_status != 1)
+ if ((csr & 0x00020000) != 1)

which is wrong, because second version is always true.
Fix it.

This bug was found by coccinelle (http://coccinelle.lip6.fr/).
Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3f60554c
...@@ -717,10 +717,10 @@ void et131x_rx_dma_disable(struct et131x_adapter *etdev) ...@@ -717,10 +717,10 @@ void et131x_rx_dma_disable(struct et131x_adapter *etdev)
/* Setup the receive dma configuration register */ /* Setup the receive dma configuration register */
writel(0x00002001, &etdev->regs->rxdma.csr); writel(0x00002001, &etdev->regs->rxdma.csr);
csr = readl(&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); udelay(5);
csr = readl(&etdev->regs->rxdma.csr); csr = readl(&etdev->regs->rxdma.csr);
if ((csr & 0x00020000) != 1) if ((csr & 0x00020000) == 0)
dev_err(&etdev->pdev->dev, dev_err(&etdev->pdev->dev,
"RX Dma failed to enter halt state. CSR 0x%08x\n", "RX Dma failed to enter halt state. CSR 0x%08x\n",
csr); csr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment