Skip to contentSkip to conversation

sa1111ps2: Use disable_irq_nosync() from within irq handlers.

PATCH Applied Ben Nizette 1 participant 1 message Apr 16, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/9 sa1111ps2: Use disable_irq_nosync() from within irq handlers.

disable_irq() should wait for all running handlers to complete before returning. As such, if it's used to disable an interrupt from that interrupt's handler it will deadlock. This replaces the dangerous instances with the _nosync() variant which doesn't have this problem.

---

drivers/input/serio/sa1111ps2.c +1 -1
index 57953c0..f412c69 100644
@@ -77,7 +77,7 @@ static irqreturn_t ps2_txint(int irq, void *dev_id)
 	spin_lock(&ps2if->lock);
 	status = sa1111_readl(ps2if->base + SA1111_PS2STAT);
 	if (ps2if->head == ps2if->tail) {
-		disable_irq(irq);
+		disable_irq_nosync(irq);
 		/* done */
 	} else if (status & PS2STAT_TXE) {
 		sa1111_writel(ps2if->buf[ps2if->tail], ps2if->base + SA1111_PS2DATA);
Signature · 1 line
1.6.0.2