diff mbox series

[U-Boot] net: e1000: Fix e1000_igb semaphore handling

Message ID 20180215075549.4490-1-bernhard.messerklinger@br-automation.com
State Accepted
Commit 8f5672ea9d069193e9cebad200767761111fab02
Delegated to: Joe Hershberger
Headers show
Series [U-Boot] net: e1000: Fix e1000_igb semaphore handling | expand

Commit Message

Bernhard Messerklinger Feb. 15, 2018, 7:55 a.m. UTC 
Fix commit f1bcad22dd19 ("net: e1000: add support for writing to
EEPROM").

Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com>
---

 drivers/net/e1000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Joe Hershberger Feb. 16, 2018, 8:15 p.m. UTC | #1 
On Thu, Feb 15, 2018 at 1:55 AM, Bernhard Messerklinger
<bernhard.messerklinger@br-automation.com> wrote:
> Fix commit f1bcad22dd19 ("net: e1000: add support for writing to
> EEPROM").
>
> Signed-off-by: Bernhard Messerklinger <bernhard.messerklinger@br-automation.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Joe Hershberger March 5, 2018, 7:55 p.m. UTC | #2 
Hi Bernhard,

https://patchwork.ozlabs.org/patch/873696/ was applied to http://git.denx.de/?p=u-boot/u-boot-net.git

Thanks!
-Joe
diff mbox series

Patch

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 8316854bc1..5cc54efe48 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -1181,7 +1181,7 @@  e1000_put_hw_eeprom_semaphore(struct e1000_hw *hw)
 		return;
 
 	swsm = E1000_READ_REG(hw, SWSM);
-	if (hw->mac_type == e1000_80003es2lan) {
+	if (hw->mac_type == e1000_80003es2lan || hw->mac_type == e1000_igb) {
 		/* Release both semaphores. */
 		swsm &= ~(E1000_SWSM_SMBI | E1000_SWSM_SWESMBI);
 	} else