Merge branch 'irq/for-arm' into irq/core

[uclinux-h8/linux.git] / kernel / irq / devres.c

diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index d5d0f73..74d90a7 100644 (file)
--- 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);