Commit eddd1f2f authored Dec 07, 2021 by Dan Carpenter Committed by Greg Kroah-Hartman Dec 14, 2021

net/qla3xxx: fix an error code in ql_adapter_up()



commit d17b9737c2bc09b4ac6caf469826e5a7ce3ffab7 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: 5a4faa87 ("[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>

parent 5177509b

drivers/net/ethernet/qlogic/qla3xxx.c

+9 −10

Original line number	Diff line number	Diff line
		@@ -3496,19 +3496,18 @@ 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) {
		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;
		}
		netdev_err(ndev, "Releasing driver lock\n");
		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);