From bf4bb02afddc5366fa0a3f6deea9a9b335ca2b57 Mon Sep 17 00:00:00 2001 From: Dmitry Adamushko Date: Tue, 8 May 2007 00:27:31 -0700 Subject: [PATCH] --- yaml --- r: 54625 b: refs/heads/master c: d2d9433a4c84c9e7ed78d633fdbffb35d5afda17 h: refs/heads/master i: 54623: 7968207ee75064fa5df05e5f6955fd830ee7dac0 v: v3 --- [refs] | 2 +- trunk/kernel/irq/proc.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4faf7a428979..4ebe726db4f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c467a388ae9f236c039d4d0f4c4be07c7deebe97 +refs/heads/master: d2d9433a4c84c9e7ed78d633fdbffb35d5afda17 diff --git a/trunk/kernel/irq/proc.c b/trunk/kernel/irq/proc.c index 2db91eb54ad8..ddde0ef9ccdc 100644 --- a/trunk/kernel/irq/proc.c +++ b/trunk/kernel/irq/proc.c @@ -66,12 +66,19 @@ static int name_unique(unsigned int irq, struct irqaction *new_action) { struct irq_desc *desc = irq_desc + irq; struct irqaction *action; + unsigned long flags; + int ret = 1; - for (action = desc->action ; action; action = action->next) + spin_lock_irqsave(&desc->lock, flags); + for (action = desc->action ; action; action = action->next) { if ((action != new_action) && action->name && - !strcmp(new_action->name, action->name)) - return 0; - return 1; + !strcmp(new_action->name, action->name)) { + ret = 0; + break; + } + } + spin_unlock_irqrestore(&desc->lock, flags); + return ret; } void register_handler_proc(unsigned int irq, struct irqaction *action)