3.16.7-ckt15 -stable review patch.  If anyone has any objections, please let me 
know.

------------------

From: Axel Lin <axel....@ingics.com>

commit 63781394c540dd9e666a6b21d70b64dd52bce76e upstream.

request_any_context_irq() returns a negative value on failure.
It returns either IRQC_IS_HARDIRQ or IRQC_IS_NESTED on success.
So fix testing return value of request_any_context_irq().

Also fixup the return value of devm_request_any_context_irq() to make it
consistent with request_any_context_irq().

Fixes: 0668d3065128 ("genirq: Add devm_request_any_context_irq()")
Signed-off-by: Axel Lin <axel....@ingics.com>
Reviewed-by: Stephen Boyd <sb...@codeaurora.org>
Link: http://lkml.kernel.org/r/1431334978.17783.4.ca...@ingics.com
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Signed-off-by: Luis Henriques <luis.henriq...@canonical.com>
---
 kernel/irq/devres.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index 1ef0606797c9..0296d6fd7d4e 100644
--- a/kernel/irq/devres.c
+++ b/kernel/irq/devres.c
@@ -104,7 +104,7 @@ int devm_request_any_context_irq(struct device *dev, 
unsigned int irq,
                return -ENOMEM;
 
        rc = request_any_context_irq(irq, handler, irqflags, devname, dev_id);
-       if (rc) {
+       if (rc < 0) {
                devres_free(dr);
                return rc;
        }
@@ -113,7 +113,7 @@ int devm_request_any_context_irq(struct device *dev, 
unsigned int irq,
        dr->dev_id = dev_id;
        devres_add(dev, dr);
 
-       return 0;
+       return rc;
 }
 EXPORT_SYMBOL(devm_request_any_context_irq);
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to