Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d7d1541 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

nfc: nfcmrvl: Fix irq_of_parse_and_map() return value 



commit 5a478a653b4cca148d5c89832f007ec0809d7e6d upstream.

The irq_of_parse_and_map() returns 0 on failure, not a negative ERRNO.

Reported-by: default avatarLv Ruyi <lv.ruyi@zte.com.cn>
Fixes: caf6e49b ("NFC: nfcmrvl: add spi driver")
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220627124048.296253-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a853b7a3

drivers/nfc/nfcmrvl/i2c.c

+3 −3
Original line number Diff line number Diff line
@@ -186,9 +186,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;

drivers/nfc/nfcmrvl/spi.c

+3 −3
Original line number Diff line number Diff line
@@ -130,9 +130,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;