leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] pcmcia: fix deadlock in pcmcia_parse_events

Browse Source 
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>
This commit is contained in:
Arjan van de Ven 2006-06-30 10:31:13 +02:00 committed by Dominik Brodowski
parent 6bb1c39a43
commit 4b7a89a3c1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/pcmcia/cs.c
View File

@ -699,11 +699,12 @@ static int pccardd(void *__skt)
*/ */
void pcmcia_parse_events(struct pcmcia_socket *s, u_int events) void pcmcia_parse_events(struct pcmcia_socket *s, u_int events)
{ {
unsigned long flags;
cs_dbg(s, 4, "parse_events: events %08x\n", events); cs_dbg(s, 4, "parse_events: events %08x\n", events);
if (s->thread) { if (s->thread) {
spin_lock(&s->thread_lock); spin_lock_irqsave(&s->thread_lock, flags);
s->thread_events |= events; s->thread_events |= events;
spin_unlock(&s->thread_lock); spin_unlock_irqrestore(&s->thread_lock, flags);
wake_up(&s->thread_wait); wake_up(&s->thread_wait);
} }