aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven La <sla@riverbed.com>2013-08-23 17:19:37 -0700
committerDavid S. Miller <davem@davemloft.net>2013-08-27 16:05:26 -0400
commit35fdb94b453bc69b7bc74b717f1e03d41d4bcdba (patch)
tree5b96a2717afd5affed63f790d7e217660adb25b8
parentd7064f4c192c19958c72b13cd9556815bedc0432 (diff)
downloadlinux-stericsson-35fdb94b453bc69b7bc74b717f1e03d41d4bcdba.tar.gz
e1000e: balance semaphore put/get for 82573
Steven (cc-ed) noticed an imbalance in semaphore put/get for 82573-based NICs. Don't we need something like the following (untested) patch? Signed-off-by: Steven La <sla@riverbed.com> Acked-by: Arthur Kepner <akepner@riverbed.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 104fcec86af3..8fed74e3fa53 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -1011,6 +1011,11 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
/* Must release MDIO ownership and mutex after MAC reset. */
switch (hw->mac.type) {
+ case e1000_82573:
+ /* Release mutex only if the hw semaphore is acquired */
+ if (!ret_val)
+ e1000_put_hw_semaphore_82573(hw);
+ break;
case e1000_82574:
case e1000_82583:
/* Release mutex only if the hw semaphore is acquired */