diff options
author | 2011-08-29 12:50:29 +0000 | |
---|---|---|
committer | 2011-08-29 22:52:50 -0400 | |
commit | 9254b751492c7fc08497a5c0e0cd668ddd269ea2 (patch) | |
tree | 0835d876bf509dc1dc776ad87ee48cdcef043fbc /drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |
parent | qlcnic: Add FLT entry for CO cards FW image region (diff) | |
download | linux-9254b751492c7fc08497a5c0e0cd668ddd269ea2.tar.gz linux-9254b751492c7fc08497a5c0e0cd668ddd269ea2.tar.bz2 linux-9254b751492c7fc08497a5c0e0cd668ddd269ea2.zip |
qlcnic: fix cdrp race condition
Reading CRB registers(if reqd) before releasing the api lock.
Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index 7f4b8e69079a..312c1c37889d 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -1889,8 +1889,8 @@ qlcnic_fetch_mac(struct qlcnic_adapter *adapter, u32 off1, u32 off2, u32 mac_low, mac_high; int i; - mac_low = QLCRD32(adapter, off1); - mac_high = QLCRD32(adapter, off2); + mac_low = off1; + mac_high = off2; if (alt_mac) { mac_low |= (mac_low >> 16) | (mac_high << 16); |