From: Dmitry Torokhov <dtor@chromium.org>
To: Lauro Ramos Venancio <lauro.venancio@openbossa.org>
Cc: Aloisio Almeida Jr <aloisio.almeida@openbossa.org>,
Samuel Ortiz <sameo@linux.intel.com>,
Clement Perrochaud <clement.perrochaud@nxp.com>,
Arron Wang <arron.wang@intel.com>,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] NFC: pn544: i2c: fix error handling of irq_of_parse_and_map
Date: Fri, 14 Nov 2014 14:29:25 -0800 [thread overview]
Message-ID: <20141114222925.GA334@dtor-ws> (raw)
Return value of irq_of_parse_and_map() is unsigned int, with 0
indicating failure, so testing for negative result never works.
Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
---
Not tested, found by casual code inspection.
drivers/nfc/pn544/i2c.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/nfc/pn544/i2c.c b/drivers/nfc/pn544/i2c.c
index 440291a..cfb3f0b 100644
--- a/drivers/nfc/pn544/i2c.c
+++ b/drivers/nfc/pn544/i2c.c
@@ -918,13 +918,12 @@ static int pn544_hci_i2c_of_request_resources(struct i2c_client *client)
}
/* IRQ */
- ret = irq_of_parse_and_map(pp, 0);
- if (ret < 0) {
- nfc_err(&client->dev,
- "Unable to get irq, error: %d\n", ret);
+ client->irq = irq_of_parse_and_map(pp, 0);
+ if (!client->irq) {
+ nfc_err(&client->dev, "Unable to get irq\n");
+ ret = -EINVAL;
goto err_gpio_fw;
}
- client->irq = ret;
return 0;
--
2.1.0.rc2.206.gedb03e5
--
Dmitry
reply other threads:[~2014-11-14 22:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141114222925.GA334@dtor-ws \
--to=dtor@chromium.org \
--cc=aloisio.almeida@openbossa.org \
--cc=arron.wang@intel.com \
--cc=clement.perrochaud@nxp.com \
--cc=lauro.venancio@openbossa.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.