Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198434
b: refs/heads/master
c: b17e096
h: refs/heads/master
v: v3
  • Loading branch information
Chien Tung authored and Roland Dreier committed May 25, 2010
1 parent 2bcf70a commit 0a5f3a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: df02902313feb1472bc6ec16e486f72b39e9d4b2
refs/heads/master: b17e0969dc184c66ed8934e130344621829484a3
3 changes: 2 additions & 1 deletion trunk/drivers/infiniband/hw/nes/nes_hw.c
Original file line number Diff line number Diff line change
Expand Up @@ -2584,7 +2584,6 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
break;
}
}
spin_unlock_irqrestore(&nesadapter->phy_lock, flags);

if (phy_data & 0x0004) {
if (wide_ppm_offset &&
Expand Down Expand Up @@ -2639,6 +2638,8 @@ static void nes_process_mac_intr(struct nes_device *nesdev, u32 mac_number)
}
}

spin_unlock_irqrestore(&nesadapter->phy_lock, flags);

nesadapter->mac_sw_state[mac_number] = NES_MAC_SW_IDLE;
}

Expand Down

0 comments on commit 0a5f3a7

Please sign in to comment.