]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
genirq: better warning on irqchip->set_type() failure
authorDavid Brownell <dbrownell@users.sourceforge.net>
Tue, 5 Aug 2008 20:01:14 +0000 (13:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 5 Aug 2008 21:33:47 +0000 (14:33 -0700)
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>
kernel/irq/manage.c

index 152abfd3589f8fe77ea7e0e60a20b7812c7a1b0f..0314074fa232e72370db9e62b50cdc98a8d53f6a 100644 (file)
@@ -323,7 +323,8 @@ static int __irq_set_trigger(struct irq_chip *chip, unsigned int irq,
        ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK);
 
        if (ret)
-               pr_err("setting flow type for irq %u failed (%pF)\n",
+               pr_err("setting trigger mode %d for irq %u failed (%pF)\n",
+                               (int)(flags & IRQF_TRIGGER_MASK),
                                irq, chip->set_type);
 
        return ret;