| Message ID | 20220422104758.64039-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | nfc: nfcmrvl: spi: Fix irq_of_parse_and_map() return value | expand |
On Fri, 22 Apr 2022 12:47:58 +0200 Krzysztof Kozlowski wrote: > The irq_of_parse_and_map() returns 0 on failure, not a negative ERRNO. > > Fixes: caf6e49bf6d0 ("NFC: nfcmrvl: add spi driver") > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > This is another issue to https://lore.kernel.org/all/20220422084605.2775542-1-lv.ruyi@zte.com.cn/ Maybe send one patch that fixes both and also fixes the usage of ret? > diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c > index a38e2fcdfd39..01f0a08a381c 100644 > --- a/drivers/nfc/nfcmrvl/spi.c > +++ b/drivers/nfc/nfcmrvl/spi.c > @@ -115,7 +115,7 @@ static int nfcmrvl_spi_parse_dt(struct device_node *node, > } > > ret = irq_of_parse_and_map(node, 0); > - if (ret < 0) { > + if (!ret) { > pr_err("Unable to get irq, error: %d\n", ret); > return ret; > }
On 23/04/2022 01:13, Jakub Kicinski wrote: > On Fri, 22 Apr 2022 12:47:58 +0200 Krzysztof Kozlowski wrote: >> The irq_of_parse_and_map() returns 0 on failure, not a negative ERRNO. >> >> Fixes: caf6e49bf6d0 ("NFC: nfcmrvl: add spi driver") >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> --- >> This is another issue to https://lore.kernel.org/all/20220422084605.2775542-1-lv.ruyi@zte.com.cn/ > > Maybe send one patch that fixes both and also fixes the usage of ret? Bah, I just blindly copied one part of his patch without deeper check. Thanks for noticing it. Best regards, Krzysztof
diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c index a38e2fcdfd39..01f0a08a381c 100644 --- a/drivers/nfc/nfcmrvl/spi.c +++ b/drivers/nfc/nfcmrvl/spi.c @@ -115,7 +115,7 @@ static int nfcmrvl_spi_parse_dt(struct device_node *node, } ret = irq_of_parse_and_map(node, 0); - if (ret < 0) { + if (!ret) { pr_err("Unable to get irq, error: %d\n", ret); return ret; }
The irq_of_parse_and_map() returns 0 on failure, not a negative ERRNO. Fixes: caf6e49bf6d0 ("NFC: nfcmrvl: add spi driver") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- This is another issue to https://lore.kernel.org/all/20220422084605.2775542-1-lv.ruyi@zte.com.cn/ --- drivers/nfc/nfcmrvl/spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)