diff options
author | York Sun <yorksun@freescale.com> | 2014-10-17 13:44:06 -0700 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2014-10-23 11:11:05 +0200 |
commit | f56d52eb5419325cecac674156b200ed61f82ed6 (patch) | |
tree | e215f580833881747019d75ec2beb8dd1df206e4 /drivers | |
parent | 752aae30a791326581efafbb761c0cebaba8d3ea (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/e1000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 3c9115cfd6d..a13c03b8c99 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1116,7 +1116,7 @@ e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask) return -E1000_ERR_SWFW_SYNC; swfw_sync = E1000_READ_REG(hw, SW_FW_SYNC); - if ((swfw_sync & swmask) && !(swfw_sync & fwmask)) + if (!(swfw_sync & (fwmask | swmask))) break; /* firmware currently using resource (fwmask) */ |