From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c1FsY-0001fz-H3 for barebox@lists.infradead.org; Mon, 31 Oct 2016 16:56:11 +0000 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7] helo=dude.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1c1Fs9-00089D-Hp for barebox@lists.infradead.org; Mon, 31 Oct 2016 17:55:45 +0100 From: Lucas Stach Date: Mon, 31 Oct 2016 17:55:45 +0100 Message-Id: <20161031165545.5834-1-l.stach@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH] net: e1000: fix i210 register remapping To: barebox@lists.infradead.org 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 --- 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@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox