diff options
author | David Brownell <dbrownell@users.sourceforge.net> | 2008-08-05 16:01:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 17:33:47 -0400 |
commit | c69ad71bcdecbaab82cfacb1dc967bd7fd967a3b (patch) | |
tree | 0554837705dd0e63d18522085c22ab0c2c1467ff | |
parent | 5b2becc8cffdccdd60c63099f592ddd35aa6c34f (diff) |
genirq: better warning on irqchip->set_type() failure
While I'm glad to finally see the hole fixed whereby passing an invalid
IRQ trigger type to request_irq() would be ignored, the current diagnostic
isn't quite useful. Fixed by also listing the trigger type which was
rejected.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | kernel/irq/manage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 152abfd3589f..0314074fa232 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
@@ -323,7 +323,8 @@ static int __irq_set_trigger(struct irq_chip *chip, unsigned int irq, | |||
323 | ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK); | 323 | ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK); |
324 | 324 | ||
325 | if (ret) | 325 | if (ret) |
326 | pr_err("setting flow type for irq %u failed (%pF)\n", | 326 | pr_err("setting trigger mode %d for irq %u failed (%pF)\n", |
327 | (int)(flags & IRQF_TRIGGER_MASK), | ||
327 | irq, chip->set_type); | 328 | irq, chip->set_type); |
328 | 329 | ||
329 | return ret; | 330 | return ret; |