projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b72c409)
Staging: et131x: Properly disable FC in txmac.
authorNick Bowler <nbowler@draconx.ca>
Wed, 10 Mar 2010 05:10:46 +0000 (00:10 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Mar 2010 15:51:36 +0000 (08:51 -0700)
FC disable is bit 3 of the txmac ctl register, but commit 6720949d5562
("Staging: et131x: Kil the txmac type") accidentally changed the code to
set bit 2 instead.

Signed-off-by: Nick Bowler <nbowler@draconx.ca>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/staging/et131x/et1310_mac.c patch | blob | blame | history

diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c
index a292b1edc41435886ceecc013db7754d67fe6f01..737a9f5401d1be0ade322d3e198bb6ef2b0f1a38 100644 (file)
--- a/drivers/staging/et131x/et1310_mac.c
+++ b/drivers/staging/et131x/et1310_mac.c
@@ -226,7 +226,7 @@ void ConfigMACRegs2(struct et131x_adapter *etdev)
        }
 
        /* Enable TXMAC */
-       ctl |= 0x05;    /* TX mac enable, FC disable */
+       ctl |= 0x09;    /* TX mac enable, FC disable */
        writel(ctl, &etdev->regs->txmac.ctl);
 
        /* Ready to start the RXDMA/TXDMA engine */