From: Arjan van de Ven <arjan@linux.intel.com>
Date: Fri, 30 Jun 2006 08:31:13 +0000 (+0200)
Subject: [PATCH] pcmcia: fix deadlock in pcmcia_parse_events
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4b7a89a3c1cf545b03470416aa821fc2ff826b91;p=openwrt%2Fstaging%2Fblogic.git

[PATCH] pcmcia: fix deadlock in pcmcia_parse_events

The PCMCIA layer calls pcmcia_parse_events both from user context and
IRQ context; the lock thus needs to be irqsave to avoid deadlocks

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 06e2cda4e07b..f9cd831a3f31 100644
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -699,11 +699,12 @@ static int pccardd(void *__skt)
  */
 void pcmcia_parse_events(struct pcmcia_socket *s, u_int events)
 {
+	unsigned long flags;
 	cs_dbg(s, 4, "parse_events: events %08x\n", events);
 	if (s->thread) {
-		spin_lock(&s->thread_lock);
+		spin_lock_irqsave(&s->thread_lock, flags);
 		s->thread_events |= events;
-		spin_unlock(&s->thread_lock);
+		spin_unlock_irqrestore(&s->thread_lock, flags);
 
 		wake_up(&s->thread_wait);
 	}