Skip to content

Commit

Permalink
[PATCH] pcmcia: fix deadlock in pcmcia_parse_events
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
fenrus75 authored and Dominik Brodowski committed Jun 30, 2006
1 parent 6bb1c39 commit 4b7a89a
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/pcmcia/cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 4b7a89a

Please sign in to comment.