mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 09:09:23 +00:00
net/qla3xxx: fix an error code in ql_adapter_up()
commitd17b9737c2
upstream. 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:5a4faa8737
("[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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5e663bcd9a
commit
126d1897cb
1 changed files with 9 additions and 10 deletions
|
@ -3494,20 +3494,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);
|
||||
|
|
Loading…
Reference in a new issue