summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/microchip
diff options
context:
space:
mode:
authorJon Ringle <jringle@gridpoint.com>2015-10-22 15:09:04 -0400
committerDavid S. Miller <davem@davemloft.net>2015-10-25 18:23:45 -0700
commit3ed770f60317a02a5a5e4a7345dc13d8819f56e8 (patch)
tree49986af8eda88440a5568415f9fd664060d209e0 /drivers/net/ethernet/microchip
parentda92bf99dd9f4b62df6168787bf0a92dc7d1bce7 (diff)
downloadlinux-stable-3ed770f60317a02a5a5e4a7345dc13d8819f56e8.tar.gz
linux-stable-3ed770f60317a02a5a5e4a7345dc13d8819f56e8.tar.bz2
linux-stable-3ed770f60317a02a5a5e4a7345dc13d8819f56e8.zip
net: encx24j600: Fix mask to update LED configuration
This fixes the mask used to update the LED configuration so that it clears the necessary bits as well as setting the bits according to the mask. Also reverse the LED configuration to show the Link state + collisions in LEDA and the Link state + TX/RX events in LEDB. Signed-off-by: Jon Ringle <jringle@gridpoint.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/microchip')
-rw-r--r--drivers/net/ethernet/microchip/encx24j600.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/microchip/encx24j600.c b/drivers/net/ethernet/microchip/encx24j600.c
index e1329d9c2acc..bf08ce2baf8d 100644
--- a/drivers/net/ethernet/microchip/encx24j600.c
+++ b/drivers/net/ethernet/microchip/encx24j600.c
@@ -617,10 +617,10 @@ static int encx24j600_hw_init(struct encx24j600_priv *priv)
(eidled & REVID_MASK) >> REVID_SHIFT);
/* PHY Leds: link status,
- * LEDA: Link + transmit/receive events
- * LEDB: Link State + colision events
+ * LEDA: Link State + collision events
+ * LEDB: Link State + transmit/receive events
*/
- encx24j600_update_reg(priv, EIDLED, 0xbc00, 0xbc00);
+ encx24j600_update_reg(priv, EIDLED, 0xff00, 0xcb00);
/* Loopback disabled */
encx24j600_write_reg(priv, MACON1, 0x9);