* [patch 1/2] be2net: add unlock on error path
@ 2010-05-26 14:46 Dan Carpenter
2010-05-27 6:31 ` Sarveshwar Bandi
2010-05-29 7:20 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Dan Carpenter @ 2010-05-26 14:46 UTC (permalink / raw)
To: Sathya Perla
Cc: Subbu Seetharaman, Sarveshwar Bandi, Ajit Khaparde,
David S. Miller, netdev, kernel-janitors
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>
diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index c911bfb..18d5789 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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [patch 1/2] be2net: add unlock on error path
2010-05-26 14:46 [patch 1/2] be2net: add unlock on error path Dan Carpenter
@ 2010-05-27 6:31 ` Sarveshwar Bandi
2010-05-29 7:20 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sarveshwar Bandi @ 2010-05-27 6:31 UTC (permalink / raw)
To: Dan Carpenter
Cc: Sathya Perla, Subbu Seetharaman, Ajit Khaparde, David S. Miller,
netdev, kernel-janitors
Thanks
Acked-by: Sarveshwar Bandi <sarveshwarb@serverengines.com>
On 26/05/10 16:46 +0200, Dan Carpenter wrote:
> 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>
>
> diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
> index c911bfb..18d5789 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;
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 1/2] be2net: add unlock on error path
2010-05-26 14:46 [patch 1/2] be2net: add unlock on error path Dan Carpenter
2010-05-27 6:31 ` Sarveshwar Bandi
@ 2010-05-29 7:20 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-05-29 7:20 UTC (permalink / raw)
To: error27; +Cc: sathyap, subbus, sarveshwarb, ajitk, netdev, kernel-janitors
From: Dan Carpenter <error27@gmail.com>
Date: Wed, 26 May 2010 16:46:35 +0200
> 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>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-29 7:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-26 14:46 [patch 1/2] be2net: add unlock on error path Dan Carpenter
2010-05-27 6:31 ` Sarveshwar Bandi
2010-05-29 7:20 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).