net/e1000: Fix EEPROM access error
authorYork Sun <yorksun@freescale.com>
Fri, 17 Oct 2014 20:44:06 +0000 (13:44 -0700)
committerTom Rini <trini@ti.com>
Mon, 27 Oct 2014 21:54:09 +0000 (17:54 -0400)
commit76f8cdb2036bf86ec7193ed13129797f0a32d13d
treeefcc487ebcfe8916a8b9d54707c990713010cdc3
parent998194584e53db13a9ed01f78c8f856e8f0bec67
net/e1000: Fix EEPROM access error

Commit 951860634fdb557bbb58e0f99215391bc0c29779 may have changed
the logic unintentially from "if (!(swfw_sync & (fwmask | swmask)))"
to "if ((swfw_sync & swmask) && !(swfw_sync & fwmask))". This change
breaks some e1000 NIC with a message "ERROR: Unable to read EEPROM!".

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Marek Vasut <marex@denx.de>
CC: Tim Harvey <tharvey@gateworks.com>
Acked-by: Marcel Ziswiler <marcel@ziswiler.com>
drivers/net/e1000.c