* [PATCH net v2] net/qla3xxx: fix an error code in ql_adapter_up()
@ 2021-12-07 8:24 Dan Carpenter
2021-12-07 18:50 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2021-12-07 8:24 UTC (permalink / raw)
To: GR-Linux-NIC-Dev, Ron Mercer
Cc: David S. Miller, Jakub Kicinski, Jeff Garzik, netdev, kernel-janitors
The ql_wait_for_drvr_lock() fails and returns false, then this
function should return an error code instead of returning success.
The other problem is that the success path prints an error message
netdev_err(ndev, "Releasing driver lock\n"); Delete that and
re-order the code a little to make it more clear.
Fixes: 5a4faa873782 ("[PATCH] qla3xxx NIC driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
v2: fix the subject and Fixes tag. Delete the bogus error message.
drivers/net/ethernet/qlogic/qla3xxx.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index 1e6d72adfe43..71523d747e93 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -3480,20 +3480,19 @@ static int ql_adapter_up(struct ql3_adapter *qdev)
spin_lock_irqsave(&qdev->hw_lock, hw_flags);
- err = ql_wait_for_drvr_lock(qdev);
- if (err) {
- err = ql_adapter_initialize(qdev);
- if (err) {
- netdev_err(ndev, "Unable to initialize adapter\n");
- goto err_init;
- }
- netdev_err(ndev, "Releasing driver lock\n");
- ql_sem_unlock(qdev, QL_DRVR_SEM_MASK);
- } else {
+ if (!ql_wait_for_drvr_lock(qdev)) {
netdev_err(ndev, "Could not acquire driver lock\n");
+ err = -ENODEV;
goto err_lock;
}
+ err = ql_adapter_initialize(qdev);
+ if (err) {
+ netdev_err(ndev, "Unable to initialize adapter\n");
+ goto err_init;
+ }
+ ql_sem_unlock(qdev, QL_DRVR_SEM_MASK);
+
spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
set_bit(QL_ADAPTER_UP, &qdev->flags);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net v2] net/qla3xxx: fix an error code in ql_adapter_up()
2021-12-07 8:24 [PATCH net v2] net/qla3xxx: fix an error code in ql_adapter_up() Dan Carpenter
@ 2021-12-07 18:50 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-12-07 18:50 UTC (permalink / raw)
To: Dan Carpenter
Cc: GR-Linux-NIC-Dev, ron.mercer, davem, kuba, jeff, netdev, kernel-janitors
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 7 Dec 2021 11:24:16 +0300 you wrote:
> The ql_wait_for_drvr_lock() fails and returns false, then this
> function should return an error code instead of returning success.
>
> The other problem is that the success path prints an error message
> netdev_err(ndev, "Releasing driver lock\n"); Delete that and
> re-order the code a little to make it more clear.
>
> [...]
Here is the summary with links:
- [net,v2] net/qla3xxx: fix an error code in ql_adapter_up()
https://git.kernel.org/netdev/net/c/d17b9737c2bc
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-07 18:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-07 8:24 [PATCH net v2] net/qla3xxx: fix an error code in ql_adapter_up() Dan Carpenter
2021-12-07 18:50 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.