lkml.org 
[lkml]   [2022]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 26/58] nfc: nfcmrvl: Fix irq_of_parse_and_map() return value
    Date
    From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

    commit 5a478a653b4cca148d5c89832f007ec0809d7e6d upstream.

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

    Reported-by: Lv Ruyi <lv.ruyi@zte.com.cn>
    Fixes: caf6e49bf6d0 ("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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/nfc/nfcmrvl/i2c.c | 6 +++---
    drivers/nfc/nfcmrvl/spi.c | 6 +++---
    2 files changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/nfc/nfcmrvl/i2c.c
    +++ b/drivers/nfc/nfcmrvl/i2c.c
    @@ -186,9 +186,9 @@ static int nfcmrvl_i2c_parse_dt(struct d
    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;

    --- a/drivers/nfc/nfcmrvl/spi.c
    +++ b/drivers/nfc/nfcmrvl/spi.c
    @@ -129,9 +129,9 @@ static int nfcmrvl_spi_parse_dt(struct d
    }

    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;


    \
     
     \ /
      Last update: 2022-07-05 14:13    [W:4.299 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site