Skip to contentSkip to conversation

genirq updates for 2.6.33

GIT PULL Thomas Gleixner 1 participant 1 message Dec 6, 2009 IRQ

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest irq-core-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-core-for-linus

Thanks,

tglx

------------------>
Luis Henriques (1):
genirq: do not execute DEBUG_SHIRQ when irq setup failed

 kernel/irq/manage.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/irq/manage.c +1 -1
index 1516ab7..8c68d5b 100644
@@ -768,7 +768,7 @@ int request_irq(unsigned int irq, irq_handler_t handler,
 		kfree(action);
 
 #ifdef CONFIG_DEBUG_SHIRQ
-	if (irqflags & IRQF_SHARED) {
+	if (!retval && (irqflags & IRQF_SHARED)) {
 		/*
 		 * It's a shared IRQ -- the driver ought to be prepared for it
 		 * to happen immediately, so let's make sure....