diff options
| author | Ben Nizette <bn@niasdigital.com> | 2009-04-16 05:54:12 +1000 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-05-05 12:16:56 -0700 |
| commit | ca50a51e890b0a62b44b5642c1ba5049909e5a8b (patch) | |
| tree | d5804f7a5ab5760e996093690654df3a59e9adf8 /drivers/dma | |
| parent | c56c81abe7e684bc6203632d807303eb765690dc (diff) | |
| download | op-kernel-dev-ca50a51e890b0a62b44b5642c1ba5049909e5a8b.zip op-kernel-dev-ca50a51e890b0a62b44b5642c1ba5049909e5a8b.tar.gz | |
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/dma')
| -rw-r--r-- | drivers/dma/ipu/ipu_idmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/ipu/ipu_idmac.c b/drivers/dma/ipu/ipu_idmac.c index e202a6c..3a4deea 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) struct idmac_channel *ichan = dev_id; printk(KERN_DEBUG "Got SOF IRQ %d on Channel %d\n", irq, ichan->dma_chan.chan_id); - disable_irq(irq); + disable_irq_nosync(irq); return IRQ_HANDLED; } @@ -1556,7 +1556,7 @@ static irqreturn_t ic_eof_irq(int irq, void *dev_id) struct idmac_channel *ichan = dev_id; printk(KERN_DEBUG "Got EOF IRQ %d on Channel %d\n", irq, ichan->dma_chan.chan_id); - disable_irq(irq); + disable_irq_nosync(irq); return IRQ_HANDLED; } |
