mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
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>
This commit is contained in:
parent
c56c81abe7
commit
ca50a51e89
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue