]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] pcmcia: fix deadlock in pcmcia_parse_events
authorArjan van de Ven <arjan@linux.intel.com>
Fri, 30 Jun 2006 08:31:13 +0000 (10:31 +0200)
committerDominik Brodowski <linux@dominikbrodowski.net>
Fri, 30 Jun 2006 20:09:13 +0000 (22:09 +0200)
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>
drivers/pcmcia/cs.c

index 06e2cda4e07b8fe31e17f5c4c2013b163e105c2f..f9cd831a3f3159ab18085dae94476976ade6c4fd 100644 (file)
@@ -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);
        }