summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-05-26 04:46:35 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-29 00:18:49 -0700
commit2892d9c2d925e0d72a7a529852942e2592a970f8 (patch)
treeb2ffaafc603f4923ab5b50ff3f3ee7ad3b3d0c0c /drivers/net
parent5daf47bb4e708fde32c1856a0d049e3c3d03c36c (diff)
downloadlinux-3.10-2892d9c2d925e0d72a7a529852942e2592a970f8.tar.gz
linux-3.10-2892d9c2d925e0d72a7a529852942e2592a970f8.tar.bz2
linux-3.10-2892d9c2d925e0d72a7a529852942e2592a970f8.zip
be2net: add unlock on error path
The unlock accidentally got removed from the error path in dd131e76e5: "be2net: Bug fix to avoid disabling bottom half during firmware upgrade." Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Sarveshwar Bandi <sarveshwarb@serverengines.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/benet/be_cmds.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 9d11dbf5e4d..a4a9cf76244 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -1429,7 +1429,7 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd,
wrb = wrb_from_mccq(adapter);
if (!wrb) {
status = -EBUSY;
- goto err;
+ goto err_unlock;
}
req = cmd->va;
sge = nonembedded_sgl(wrb);
@@ -1457,7 +1457,10 @@ int be_cmd_write_flashrom(struct be_adapter *adapter, struct be_dma_mem *cmd,
else
status = adapter->flash_status;
-err:
+ return status;
+
+err_unlock:
+ spin_unlock_bh(&adapter->mcc_lock);
return status;
}