From nobody Sun Apr 19 20:40:11 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3C95DCCA473 for ; Mon, 27 Jun 2022 12:41:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236249AbiF0Mk7 (ORCPT ); Mon, 27 Jun 2022 08:40:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236268AbiF0Mkx (ORCPT ); Mon, 27 Jun 2022 08:40:53 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02352B7F5 for ; Mon, 27 Jun 2022 05:40:52 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id ge10so18872659ejb.7 for ; Mon, 27 Jun 2022 05:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lJMIQmaTr/csqoOVBa8hy1Civ+/zMXbxh5Fbkw0Bj30=; b=av3iLNYbThYrQEBCn1cu5+D5JyQmpouY/f3wntuG/EajpMnFxNhIoJxrVeL9F5RqjU lHauNhXX+xPSHcXtdIWJUvgv4lyH7D85Jab+53fcnhqLs04rUlo92ctnXhCIzC7wnUMZ WYSaBuRcWNi+yAPD2EkSMhUgBgd1IqQ9aluFnamiQXOUTvas6XFf5YxDgejS76fQE+EF FVGQAaAo3ZIKdexUk480WNaAK/7sBXxerNEhWR2BsIQEkE/QlhcaHf/HFHgsF2/RJ0tD iOvtJ/8JCcWvox5nov9Ah/zz4/4XOlDLdKbywoC/wsPsjU2k6jmDB9iBTrJk3OOftiMg 3P8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lJMIQmaTr/csqoOVBa8hy1Civ+/zMXbxh5Fbkw0Bj30=; b=lKpZNtWYEGc32kpXbzxbIOyAEgJDItUzk3WhQJn56QhiYnWApZM+cOF6iLUphzhj+M NyMynbP1176MsCbw8L2B3OyDGSEzNwmq97DyuVTqSmeezfkWAosaV8OjAHoOI8GHLCFR LfMK2uSNzz5QRzgPNRlGVx9gcimOTjKg9Bx1XlI3TXEQQMGqI2YWXMJ+kP5S4n+a8Srz 2VAsAbvsSeHAYkR975cElpFDX0HO3kBG2N7a7tveM3wzA1/thXjBF7B/WtEWi4CR+nAq VO4bGYJbkNY0A8VxDJetexeKxNhaCCRiOnysVOLcT40OENfg4N+DQ7waAJe2IKPQdzPB h+Qw== X-Gm-Message-State: AJIora+0VaI4ANOLM3nVQE2m1p/2jGzmd//KnDrLmeV/AK4Ct81aN4O4 aHfM45+e/pvNS880hZdZfHylXu00uqieHw== X-Google-Smtp-Source: AGRyM1vUtVCS8Qwszx2mLh1lEctO7HOktkVRsGdoSM3zBXW9DMbcuTR+4Cj4Kzp1Ew9pwpWazggfQQ== X-Received: by 2002:a17:906:54c3:b0:6ef:d07b:c8ec with SMTP id c3-20020a17090654c300b006efd07bc8ecmr12026339ejp.687.1656333650598; Mon, 27 Jun 2022 05:40:50 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id o3-20020aa7c503000000b0042de8155fa1sm7641524edq.0.2022.06.27.05.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jun 2022 05:40:50 -0700 (PDT) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Samuel Ortiz , Vincent Cuissard , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lv Ruyi Subject: [PATCH v2] nfc: nfcmrvl: Fix irq_of_parse_and_map() return value Date: Mon, 27 Jun 2022 14:40:48 +0200 Message-Id: <20220627124048.296253-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The irq_of_parse_and_map() returns 0 on failure, not a negative ERRNO. Reported-by: Lv Ruyi Fixes: caf6e49bf6d0 ("NFC: nfcmrvl: add spi driver") Signed-off-by: Krzysztof Kozlowski --- Changes since v1: 1. Do not print 'rc' in error msg. 2. Fix also I2C. --- drivers/nfc/nfcmrvl/i2c.c | 6 +++--- drivers/nfc/nfcmrvl/spi.c | 6 +++--- 2 files changed, 6 insertions(+), 6 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 *nod= e, pdata->irq_polarity =3D IRQF_TRIGGER_RISING; =20 ret =3D 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 =3D ret; =20 diff --git a/drivers/nfc/nfcmrvl/spi.c b/drivers/nfc/nfcmrvl/spi.c index a38e2fcdfd39..ad3359a4942c 100644 --- 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 *nod= e, } =20 ret =3D 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 =3D ret; =20 --=20 2.34.1