nfc: nfcmrvl: Fix irq_of_parse_and_map() return value

krzk · kuba-moo · commit 5a478a653b4c · 2022-06-28T21:27:53.000-07:00
The irq_of_parse_and_map() returns 0 on failure, not a negative ERRNO. Reported-by: Lv Ruyi <lv.ruyi@zte.com.cn> Fixes: caf6e49 ("NFC: nfcmrvl: add spi driver") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://lore.kernel.org/r/20220627124048.296253-1-krzysztof.kozlowski@linaro.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git 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;
 
diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c
@@ -115,9 +115,9 @@ static int nfcmrvl_spi_parse_dt(struct device_node *node,
 	}
 
 	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;
 

Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,9 @@ static int nfcmrvl_spi_parse_dt(struct device_node *node,`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`ret = irq_of_parse_and_map(node, 0);`
`118`		`- if (ret < 0) {`
`119`		`- pr_err("Unable to get irq, error: %d\n", ret);`
`120`		`- return ret;`
	`118`	`+ if (!ret) {`
	`119`	`+ pr_err("Unable to get irq\n");`
	`120`	`+ return -EINVAL;`
`121`	`121`	`}`
`122`	`122`	`pdata->irq = ret;`
`123`	`123`