Commit d17b9737 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jakub Kicinski

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: 5a4faa87 ("[PATCH] qla3xxx NIC driver")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20211207082416.GA16110@kiliSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 2a62df36
...@@ -3480,19 +3480,18 @@ static int ql_adapter_up(struct ql3_adapter *qdev) ...@@ -3480,19 +3480,18 @@ static int ql_adapter_up(struct ql3_adapter *qdev)
spin_lock_irqsave(&qdev->hw_lock, hw_flags); spin_lock_irqsave(&qdev->hw_lock, hw_flags);
err = ql_wait_for_drvr_lock(qdev); if (!ql_wait_for_drvr_lock(qdev)) {
if (err) { netdev_err(ndev, "Could not acquire driver lock\n");
err = -ENODEV;
goto err_lock;
}
err = ql_adapter_initialize(qdev); err = ql_adapter_initialize(qdev);
if (err) { if (err) {
netdev_err(ndev, "Unable to initialize adapter\n"); netdev_err(ndev, "Unable to initialize adapter\n");
goto err_init; goto err_init;
} }
netdev_err(ndev, "Releasing driver lock\n");
ql_sem_unlock(qdev, QL_DRVR_SEM_MASK); ql_sem_unlock(qdev, QL_DRVR_SEM_MASK);
} else {
netdev_err(ndev, "Could not acquire driver lock\n");
goto err_lock;
}
spin_unlock_irqrestore(&qdev->hw_lock, hw_flags); spin_unlock_irqrestore(&qdev->hw_lock, hw_flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment