Skip to content

Commit d17b973

Browse files
Dan Carpenterkuba-moo
authored andcommitted
net/qla3xxx: fix an error code in ql_adapter_up()
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: 5a4faa8 ("[PATCH] qla3xxx NIC driver") Signed-off-by: Dan Carpenter <[email protected]> Link: https://lore.kernel.org/r/20211207082416.GA16110@kili Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 2a62df3 commit d17b973

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

drivers/net/ethernet/qlogic/qla3xxx.c

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3480,20 +3480,19 @@ static int ql_adapter_up(struct ql3_adapter *qdev)
34803480

34813481
spin_lock_irqsave(&qdev->hw_lock, hw_flags);
34823482

3483-
err = ql_wait_for_drvr_lock(qdev);
3484-
if (err) {
3485-
err = ql_adapter_initialize(qdev);
3486-
if (err) {
3487-
netdev_err(ndev, "Unable to initialize adapter\n");
3488-
goto err_init;
3489-
}
3490-
netdev_err(ndev, "Releasing driver lock\n");
3491-
ql_sem_unlock(qdev, QL_DRVR_SEM_MASK);
3492-
} else {
3483+
if (!ql_wait_for_drvr_lock(qdev)) {
34933484
netdev_err(ndev, "Could not acquire driver lock\n");
3485+
err = -ENODEV;
34943486
goto err_lock;
34953487
}
34963488

3489+
err = ql_adapter_initialize(qdev);
3490+
if (err) {
3491+
netdev_err(ndev, "Unable to initialize adapter\n");
3492+
goto err_init;
3493+
}
3494+
ql_sem_unlock(qdev, QL_DRVR_SEM_MASK);
3495+
34973496
spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
34983497

34993498
set_bit(QL_ADAPTER_UP, &qdev->flags);

0 commit comments

Comments
 (0)