summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2016-10-31 17:58:12 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2016-11-03 07:08:28 +0100
commit8ecc3823cde480829323f6a3682ed66a89bf7e45 (patch)
tree0e9e5abaac0c8dfe0d63cc47d2ef1844c5b6f44a /drivers/net
parent75ee6ab0765d67f84d8152d3d18065c17ea9b50c (diff)
downloadbarebox-8ecc3823cde480829323f6a3682ed66a89bf7e45.tar.gz
barebox-8ecc3823cde480829323f6a3682ed66a89bf7e45.tar.xz
net: e1000: fix i210 register remapping
Don't mask out the remapping flag before checking the register offset, otherwise none of the switch statements will ever match. Fixes: ff6a64d42ffc (e1000: Consolidate register offset fixups) Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/e1000/regio.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e1000/regio.c b/drivers/net/e1000/regio.c
index b2e9d7b6a7..1610d5851f 100644
--- a/drivers/net/e1000/regio.c
+++ b/drivers/net/e1000/regio.c
@@ -5,8 +5,6 @@
static uint32_t e1000_true_offset(struct e1000_hw *hw, uint32_t reg)
{
if (reg & E1000_MIGHT_BE_REMAPPED) {
- reg &= ~E1000_MIGHT_BE_REMAPPED;
-
if (hw->mac_type == e1000_igb) {
switch (reg) {
case E1000_EEWR:
@@ -19,7 +17,8 @@ static uint32_t e1000_true_offset(struct e1000_hw *hw, uint32_t reg)
reg = E1000_I210_EEMNGCTL;
break;
}
- };
+ }
+ reg &= ~E1000_MIGHT_BE_REMAPPED;
}
return reg;