---

yaml --- r: 189076 b: refs/heads/master c: cc8c3b7 h: refs/heads/master v: v3
git-mirror · Mar 24, 2010 · ccbd6e1 · ccbd6e1
1 parent 2f6f41a
commit ccbd6e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b1adaa031a55e44f5dd942f234bf09d28e8a0d6
+refs/heads/master: cc8c3b78433222e5dbc1fdfcfdde29e1743f181a
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
@@ -382,18 +382,22 @@ int can_request_irq(unsigned int irq, unsigned long irqflags)
 {
 	struct irq_desc *desc = irq_to_desc(irq);
 	struct irqaction *action;
+	unsigned long flags;
 
 	if (!desc)
 		return 0;
 
 	if (desc->status & IRQ_NOREQUEST)
 		return 0;
 
+	raw_spin_lock_irqsave(&desc->lock, flags);
 	action = desc->action;
 	if (action)
 		if (irqflags & action->flags & IRQF_SHARED)
 			action = NULL;
 
+	raw_spin_unlock_irqrestore(&desc->lock, flags);
+
 	return !action;
 }