Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   cgel.zte@gmail.com
To:     kuba@kernel.org
Cc:     cgel.zte@gmail.com, cuissard@marvell.com, davem@davemloft.net,
        krzysztof.kozlowski@linaro.org, linux-kernel@vger.kernel.org,
        lv.ruyi@zte.com.cn, netdev@vger.kernel.org, sameo@linux.intel.com,
        yashsri421@gmail.com, Zeal Robot <zealci@zte.com.cn>
Subject: [PATCH v2] NFC: nfcmrvl: fix error check return value of irq_of_parse_and_map()
Date:   Sun, 24 Apr 2022 02:57:10 +0000
Message-Id: <20220424025710.3166034-1-lv.ruyi@zte.com.cn>
In-Reply-To: <20220422160931.6a4eca42@kernel.org>
References: <20220422160931.6a4eca42@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Lv Ruyi <lv.ruyi@zte.com.cn>

The irq_of_parse_and_map() function returns 0 on failure, and does not
return an negative value.

Fixes: b5b3e23e4cac ("NFC: nfcmrvl: add i2c driver")
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
---
v2: don't print ret, and return -EINVAL rather than 0
---
 drivers/nfc/nfcmrvl/i2c.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c
index ceef81d93ac9..01329b91d59d 100644
--- a/drivers/nfc/nfcmrvl/i2c.c
+++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -167,9 +167,9 @@ static int nfcmrvl_i2c_parse_dt(struct device_node *node,
 		pdata->irq_polarity = IRQF_TRIGGER_RISING;
 
 	ret = irq_of_parse_and_map(node, 0);
-	if (ret < 0) {
-		pr_err("Unable to get irq, error: %d\n", ret);
-		return ret;
+	if (!ret) {
+		pr_err("Unable to get irq\n");
+		return -EINVAL;
 	}
 	pdata->irq = ret;
 
-- 
2.25.1