2014-11-14 22:06:42

by Dmitry Torokhov

[permalink] [raw]
Subject: [PATCH] HIS: nokia-modem: fix error handling of irq_of_parse_and_map

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 <[email protected]>
---

Not tested, found by casual code inspection.

drivers/hsi/clients/nokia-modem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c
index e43c3c9..32cc9af 100644
--- a/drivers/hsi/clients/nokia-modem.c
+++ b/drivers/hsi/clients/nokia-modem.c
@@ -164,9 +164,9 @@ static int nokia_modem_probe(struct device *dev)
dev_set_drvdata(dev, modem);

irq = irq_of_parse_and_map(np, 0);
- if (irq < 0) {
+ if (!irq) {
dev_err(dev, "Invalid rst_ind interrupt (%d)\n", irq);
- return irq;
+ return -EINVAL;
}
modem->nokia_modem_rst_ind_irq = irq;
pflags = irq_get_trigger_type(irq);
--
2.1.0.rc2.206.gedb03e5


--
Dmitry


2014-11-14 22:44:14

by Sebastian Reichel

[permalink] [raw]
Subject: Re: [PATCH] HIS: nokia-modem: fix error handling of irq_of_parse_and_map

On Fri, Nov 14, 2014 at 02:06:37PM -0800, Dmitry Torokhov wrote:
> 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 <[email protected]>

https://git.kernel.org/cgit/linux/kernel/git/sre/linux-hsi.git/commit/?h=for-next&id=d95dc9e388104488d0f5a5969c435e601840da2e

-- Sebastian


Attachments:
(No filename) (393.00 B)
signature.asc (819.00 B)
Digital signature
Download all attachments

2014-11-16 08:38:00

by Pavel Machek

[permalink] [raw]
Subject: Re: [PATCH] HIS: nokia-modem: fix error handling of irq_of_parse_and_map

On Fri 2014-11-14 23:44:07, Sebastian Reichel wrote:
> On Fri, Nov 14, 2014 at 02:06:37PM -0800, Dmitry Torokhov wrote:
> > 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 <[email protected]>
>
> https://git.kernel.org/cgit/linux/kernel/git/sre/linux-hsi.git/commit/?h=for-next&id=d95dc9e388104488d0f5a5969c435e601840da2e
>

Acked-by: Pavel Machek <[email protected]>

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html