Commit 36d935a0 authored Oct 25, 2021 by Jakub Kicinski

Merge branch 'small-fixes-for-true-expression-checks'

Jean Sacren says:

====================
Small fixes for true expression checks

This series fixes checks of true !rc expression.
====================

Link: https://lore.kernel.org/r/cover.1634974124.git.sakiwit@gmail.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents e43b76ab 036f590f

drivers/net/ethernet/qlogic/qed/qed_dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3992,7 +3992,7 @@ static int qed_hw_get_resc(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)
		} else if (rc == -EINVAL) {
		DP_INFO(p_hwfn,
		"Skip the max values setting of the soft resources since the resource lock is not supported by the MFW\n");
		} else if (!rc && !resc_lock_params.b_granted) {
		} else if (!resc_lock_params.b_granted) {
		DP_NOTICE(p_hwfn,
		"Failed to acquire the resource lock for the resource allocation commands\n");
		return -EBUSY;

drivers/net/ethernet/qlogic/qed/qed_ptp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -63,12 +63,12 @@ static int qed_ptp_res_lock(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)

		DP_INFO(p_hwfn, "PF doesn't have lock ownership\n");
		return -EBUSY;
		} else if (!rc && !params.b_granted) {
		} else if (!params.b_granted) {
		DP_INFO(p_hwfn, "Failed to acquire ptp resource lock\n");
		return -EBUSY;
		}

		return rc;
		return 0;
		}

		static int qed_ptp_res_unlock(struct qed_hwfn p_hwfn, struct qed_ptt p_ptt)