Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 5a4faa873782 ("[PATCH] qla3xxx NIC driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20211207082416.GA16110@kili
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Dan Carpenter and committed by
Jakub Kicinski
d17b9737 2a62df36

+9 -10
+9 -10
drivers/net/ethernet/qlogic/qla3xxx.c
··· 3480 3480 3481 3481 spin_lock_irqsave(&qdev->hw_lock, hw_flags); 3482 3482 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)) { 3493 3484 netdev_err(ndev, "Could not acquire driver lock\n"); 3485 + err = -ENODEV; 3494 3486 goto err_lock; 3495 3487 } 3488 + 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); 3496 3495 3497 3496 spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); 3498 3497