aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBen Nizette <bn@niasdigital.com>2009-04-15 15:54:12 -0400
committerDan Williams <dan.j.williams@intel.com>2009-05-05 15:16:56 -0400
commitca50a51e890b0a62b44b5642c1ba5049909e5a8b (patch)
treed5804f7a5ab5760e996093690654df3a59e9adf8 /drivers
parentc56c81abe7e684bc6203632d807303eb765690dc (diff)
ipu_idmac: 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. Note the 2 handlers in question are only used #ifdef DEBUG so I imagine these code paths don't get hit often. Signed-off-by: Ben Nizette <bn@niasdigital.com> Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/ipu/ipu_idmac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c
index e202a6ce5573..3a4deea78a71 100644
--- a/drivers/dma/ipu/ipu_idmac.c
+++ b/drivers/dma/ipu/ipu_idmac.c
@@ -1547,7 +1547,7 @@ static irqreturn_t ic_sof_irq(int irq, void *dev_id)
1547 struct idmac_channel *ichan = dev_id; 1547 struct idmac_channel *ichan = dev_id;
1548 printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n", 1548 printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n",
1549 irq, ichan->dma_chan.chan_id); 1549 irq, ichan->dma_chan.chan_id);
1550 disable_irq(irq); 1550 disable_irq_nosync(irq);
1551 return IRQ_HANDLED; 1551 return IRQ_HANDLED;
1552} 1552}
1553 1553
@@ -1556,7 +1556,7 @@ static irqreturn_t ic_eof_irq(int irq, void *dev_id)
1556 struct idmac_channel *ichan = dev_id; 1556 struct idmac_channel *ichan = dev_id;
1557 printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n", 1557 printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n",
1558 irq, ichan->dma_chan.chan_id); 1558 irq, ichan->dma_chan.chan_id);
1559 disable_irq(irq); 1559 disable_irq_nosync(irq);
1560 return IRQ_HANDLED; 1560 return IRQ_HANDLED;
1561} 1561}
1562 1562