aboutsummaryrefslogtreecommitdiff
path: root/kernel/irq/devres.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-05-11 17:02:58 +0800
committerThomas Gleixner <tglx@linutronix.de>2015-05-13 10:47:37 +0200
commit63781394c540dd9e666a6b21d70b64dd52bce76e (patch)
tree9a4fb9ac620df0aa9c79c145a0963ca2eaf41ede /kernel/irq/devres.c
parentdbf07cf0c846c3a0d3f97976931cb4ae78f730e2 (diff)
downloadlinux-stericsson-63781394c540dd9e666a6b21d70b64dd52bce76e.tar.gz
genirq: devres: Fix testing return value of request_any_context_irq()
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.lin@ingics.com> Reviewed-by: Stephen Boyd <sboyd@codeaurora.org> Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/1431334978.17783.4.camel@ingics.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq/devres.c')
-rw-r--r--kernel/irq/devres.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index d5d0f7345c54..74d90a754268 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);