bnx2x: unlock before returning an error

PATCH Applied Dan Carpenter 3 participants 3 messages Jan 25, 2012

Subsystems (4)

Networking Network drivers Kernel janitors Broadcom BNX2X 10 gigabit Ethernet driver

lore

Share & tools

lore

Dan Carpenter

author

2012-01-25 07:59 UTC #0 lore raw

PATCH 1/1 bnx2x: unlock before returning an error

We introduced a new return here but forgot to drop the lock.

Signed-off-by Dan Carpenter <[email protected]>

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +1 -0

index cb6339c..69465c3 100644
@@ -1836,6 +1836,7 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp,
 			rc = exeq->remove(bp, exeq->owner, exeq_pos);
 			if (rc) {
 				BNX2X_ERR("Failed to remove command\n");
+				spin_unlock_bh(&exeq->lock);
 				return rc;
 			}
 			list_del(&exeq_pos->link);

Dmitry Kravkov

Acked-by on v1 1/1

2012-01-25 08:14 UTC #1 lore raw

Quoted 9 lines · Dan Carpenter

We introduced a new return here but forgot to drop the lock.
Signed-off-by Dan Carpenter <[email protected]>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +0 -0
index cb6339c..69465c3 100644

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c static int bnx2x_vlan_mac_del_all(struct bnx2x *bp,

Quoted 8 lines

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c +1 -1

@@ -1836,6 +1836,7 @@ static int bnx2x_vlan_mac_del_all(struct bnx2x *bp,
 			rc = exeq->remove(bp, exeq->owner, exeq_pos);
 			if (rc) {
 				BNX2X_ERR("Failed to remove command\n");
+				spin_unlock_bh(&exeq->lock);
 				return rc;
 			}
 			list_del(&exeq_pos->link);
--

Thank you, Dan.

Acked-by Dmitry Kravkov <[email protected]>

David Miller

maintainer Applied

2012-01-25 21:59 UTC #2 lore raw

From: "Dmitry Kravkov" <[email protected]>
Date: Wed, 25 Jan 2012 10:14:54 +0200

Quoted 4 lines · Dan Carpenter

Quoted 3 lines
We introduced a new return here but forgot to drop the lock.
Signed-off-by Dan Carpenter <[email protected]>

...

Quoted 1 line

Acked-by Dmitry Kravkov <[email protected]>

Applied, thanks.