Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b7a89a3 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Dominik Brodowski
Browse files

[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: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 6bb1c39a

drivers/pcmcia/cs.c

+3 −2
Original line number Diff line number Diff line
@@ -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);

	}