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@xxxxxxxxxxxxxx> --- drivers/net/e1000/regio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/e1000/regio.c b/drivers/net/e1000/regio.c index b2e9d7b6a7df..17d08da3b8a2 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,9 @@ static uint32_t e1000_true_offset(struct e1000_hw *hw, uint32_t reg) reg = E1000_I210_EEMNGCTL; break; } - }; + } else { + reg &= ~E1000_MIGHT_BE_REMAPPED; + } } return reg; -- 2.10.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox