2014-11-14 22:12:27

by Dmitry Torokhov

Subject: [PATCH] brcmfmac: 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/net/wireless/brcm80211/brcmfmac/of.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/of.c b/drivers/net/wireless/brcm80211/brcmfmac/of.c
index eb3fce82..c824570 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/of.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/of.c
@@ -40,8 +40,8 @@ void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev)
return;

irq = irq_of_parse_and_map(np, 0);
- if (irq < 0) {
- brcmf_err("interrupt could not be mapped: err=%d\n", irq);
+ if (!irq) {
+ brcmf_err("interrupt could not be mapped\n");
devm_kfree(dev, sdiodev->pdata);
return;
}
--
2.1.0.rc2.206.gedb03e5


--
Dmitry

2014-11-16 13:02:20

by Arend van Spriel

Subject: Re: [PATCH] brcmfmac: fix error handling of irq_of_parse_and_map

On 11/14/14 23:12, 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.

Whoops, that is bad. Thanks for catching this. It probably needs to go
to stable as well for 3.17 kernel.

+Cc: [email protected] # v3.17
+Acked-by: Arend van Spriel <[email protected]>
> Signed-off-by: Dmitry Torokhov<[email protected]>
> ---
>
> Not tested, found by casual code inspection.
>
> drivers/net/wireless/brcm80211/brcmfmac/of.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/of.c b/drivers/net/wireless/brcm80211/brcmfmac/of.c
> index eb3fce82..c824570 100644
> --- a/drivers/net/wireless/brcm80211/brcmfmac/of.c
> +++ b/drivers/net/wireless/brcm80211/brcmfmac/of.c
> @@ -40,8 +40,8 @@ void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev)
> return;
>
> irq = irq_of_parse_and_map(np, 0);
> - if (irq< 0) {
> - brcmf_err("interrupt could not be mapped: err=%d\n", irq);
> + if (!irq) {
> + brcmf_err("interrupt could not be mapped\n");
> devm_kfree(dev, sdiodev->pdata);
> return;
> }