]> git.itanic.dy.fi Git - linux-stable/commitdiff
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:55:22 +0000 (17:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Apr 2024 07:55:22 +0000 (17:55 +1000)
1  2 
MAINTAINERS
drivers/dma/idma64.c
drivers/dma/idxd/cdev.c
drivers/dma/xilinx/xilinx_dpdma.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index eb0637d90342a6727d28c300394e81aa6fa44b74,bc27a0ca86aff66e4d119bf8d8c241d45b5e1ad2..36bd4825d389d5c2527916771393fb7fd0b34b34
@@@ -1105,10 -1101,9 +1103,10 @@@ static void xilinx_dpdma_chan_vsync_irq
        chan->desc.pending = NULL;
  
        xilinx_dpdma_chan_queue_transfer(chan);
 +      spin_unlock(&chan->vchan.lock);
  
  out:
-       spin_unlock_irqrestore(&chan->lock, flags);
+       spin_unlock(&chan->lock);
  }
  
  /**