diff options
author | Axel Lin <axel.lin@ingics.com> | 2015-05-11 05:02:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-07-21 13:10:05 -0400 |
commit | 25d8f169eee423940158a0ab33ed5dd1dd995cf9 (patch) | |
tree | 659d1e6aeb9aa778a0a68d748f6b6096b91bb4a8 /kernel | |
parent | b14524edc36d494d75c760743cc9435ef4c12a2f (diff) |
genirq: devres: Fix testing return value of request_any_context_irq()
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.lin@ingics.com>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Link: http://lkml.kernel.org/r/1431334978.17783.4.camel@ingics.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/devres.c | 4 |
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, | |||
104 | return -ENOMEM; | 104 | return -ENOMEM; |
105 | 105 | ||
106 | rc = request_any_context_irq(irq, handler, irqflags, devname, dev_id); | 106 | rc = request_any_context_irq(irq, handler, irqflags, devname, dev_id); |
107 | if (rc) { | 107 | if (rc < 0) { |
108 | devres_free(dr); | 108 | devres_free(dr); |
109 | return rc; | 109 | return rc; |
110 | } | 110 | } |
@@ -113,7 +113,7 @@ int devm_request_any_context_irq(struct device *dev, unsigned int irq, | |||
113 | dr->dev_id = dev_id; | 113 | dr->dev_id = dev_id; |
114 | devres_add(dev, dr); | 114 | devres_add(dev, dr); |
115 | 115 | ||
116 | return 0; | 116 | return rc; |
117 | } | 117 | } |
118 | EXPORT_SYMBOL(devm_request_any_context_irq); | 118 | EXPORT_SYMBOL(devm_request_any_context_irq); |
119 | 119 | ||