diff options
| author | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:15:59 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:15:59 +0100 |
| commit | b29cf44398a93ae6ea9122f9b722faad0d280981 (patch) | |
| tree | 234749820bd29bc3aaf7bc50c9862154ac896bbe /drivers/dma/idma64.c | |
| parent | 9b01029dc093262c6ad7fde6940916f154168496 (diff) | |
| parent | f4d34aa8c887a8a2d23ef546da0efa10e3f77241 (diff) | |
Merge branch 'topic/intel' into for-linus
Diffstat (limited to 'drivers/dma/idma64.c')
| -rw-r--r-- | drivers/dma/idma64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c index 40dc5d2ddf3d..0baf9797cc09 100644 --- a/drivers/dma/idma64.c +++ b/drivers/dma/idma64.c @@ -142,9 +142,8 @@ static void idma64_chan_irq(struct idma64 *idma64, unsigned short c, { struct idma64_chan *idma64c = &idma64->chan[c]; struct idma64_desc *desc; - unsigned long flags; - spin_lock_irqsave(&idma64c->vchan.lock, flags); + spin_lock(&idma64c->vchan.lock); desc = idma64c->desc; if (desc) { if (status_err & (1 << c)) { @@ -161,7 +160,7 @@ static void idma64_chan_irq(struct idma64 *idma64, unsigned short c, if (idma64c->desc == NULL || desc->status == DMA_ERROR) idma64_stop_transfer(idma64c); } - spin_unlock_irqrestore(&idma64c->vchan.lock, flags); + spin_unlock(&idma64c->vchan.lock); } static irqreturn_t idma64_irq(int irq, void *dev) |