* [PATCH] staging/et131x: fix et131x_rx_dma_disable halt_status usage
@ 2011-02-20 19:03 Marcin Slusarz
2011-02-20 19:13 ` Alan Cox
0 siblings, 1 reply; 2+ messages in thread
From: Marcin Slusarz @ 2011-02-20 19:03 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Alan Cox, LKML
Commit 1bd751c1abc1029e8a0ae63ef4f19357c735a2a3
("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: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/staging/et131x/et1310_rx.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/et131x/et1310_rx.c b/drivers/staging/et131x/et1310_rx.c
index 8e04bdd..a414830 100644
--- a/drivers/staging/et131x/et1310_rx.c
+++ b/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);
--
1.7.4.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] staging/et131x: fix et131x_rx_dma_disable halt_status usage
2011-02-20 19:03 [PATCH] staging/et131x: fix et131x_rx_dma_disable halt_status usage Marcin Slusarz
@ 2011-02-20 19:13 ` Alan Cox
0 siblings, 0 replies; 2+ messages in thread
From: Alan Cox @ 2011-02-20 19:13 UTC (permalink / raw)
To: Marcin Slusarz; +Cc: Greg Kroah-Hartman, Alan Cox, LKML
On Sun, 20 Feb 2011 20:03:34 +0100
Marcin Slusarz <marcin.slusarz@gmail.com> wrote:
> Commit 1bd751c1abc1029e8a0ae63ef4f19357c735a2a3
> ("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: Marcin Slusarz <marcin.slusarz@gmail.com>
> Cc: Alan Cox <alan@linux.intel.com>
> Cc: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Alan Cox <alan@linux.intel.com>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-20 19:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-20 19:03 [PATCH] staging/et131x: fix et131x_rx_dma_disable halt_status usage Marcin Slusarz
2011-02-20 19:13 ` Alan Cox
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.