summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
diff options
context:
space:
mode:
authorYuval Mintz2013-03-27 00:28:03 +0100
committerDavid S. Miller2013-03-27 17:48:31 +0100
commit60cde81f9dc9d70fa4462f4fefb72a1f27333af8 (patch)
tree44f652ebcdad6b840d0e15043d946983054497a9 /drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
parentnet: switch to use skb_probe_transport_header() (diff)
downloadkernel-qcow2-linux-60cde81f9dc9d70fa4462f4fefb72a1f27333af8.tar.gz
kernel-qcow2-linux-60cde81f9dc9d70fa4462f4fefb72a1f27333af8.tar.xz
kernel-qcow2-linux-60cde81f9dc9d70fa4462f4fefb72a1f27333af8.zip
bnx2x: Fix AER semaphore release
Commit 7fa6f34 "AER revised" erroneously inserted an error-flow in which a semaphore is released even though the attempt to take it has failed. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Yuval Mintz <yuvalmin@broadcom.com> Signed-off-by: Ariel Elior <ariele@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c')
-rw-r--r--drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 2c6a2a6987bb..5c5a32733382 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -10070,8 +10070,8 @@ static int bnx2x_prev_unload(struct bnx2x *bp)
/* If Path is marked by EEH, ignore unload status */
aer = !!(bnx2x_prev_path_get_entry(bp) &&
bnx2x_prev_path_get_entry(bp)->aer);
+ up(&bnx2x_prev_sem);
}
- up(&bnx2x_prev_sem);
if (fw == FW_MSG_CODE_DRV_UNLOAD_COMMON || aer) {
rc = bnx2x_prev_unload_common(bp);