From: Suresh Reddy <Suresh.Reddy@avagotech.com>
Date: Mon, 12 Oct 2015 07:47:18 +0000 (-0400)
Subject: be2net: release mcc-lock in a failure case in be_cmd_notify_wait()
X-Git-Tag: Ubuntu-5.0.0-8.9~8515^2~18^2~3
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0c8845679f3b8f030f3bafcdf226ed92545fa2a9;p=mirror_ubuntu-disco-kernel.git

be2net: release mcc-lock in a failure case in be_cmd_notify_wait()

The mcc/mbox lock is not being released when be_cmd_copy() returns
an error.

Signed-off-by: Suresh Reddy <suresh.reddy@avagotech.com>
Signed-off-by: Sathya Perla <sathya.perla@avagotech.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index eb323913cd39..9dc5ce11d996 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -851,8 +851,10 @@ static int be_cmd_notify_wait(struct be_adapter *adapter,
 		return status;
 
 	dest_wrb = be_cmd_copy(adapter, wrb);
-	if (!dest_wrb)
-		return -EBUSY;
+	if (!dest_wrb) {
+		status = -EBUSY;
+		goto unlock;
+	}
 
 	if (use_mcc(adapter))
 		status = be_mcc_notify_wait(adapter);
@@ -862,6 +864,7 @@ static int be_cmd_notify_wait(struct be_adapter *adapter,
 	if (!status)
 		memcpy(wrb, dest_wrb, sizeof(*wrb));
 
+unlock:
 	be_cmd_unlock(adapter);
 	return status;
 }