Skip to content
  • Linus Torvalds's avatar
    Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · b45bbf07
    Linus Torvalds authored
    * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (21 commits)
      dmaengine: add slave-dma maintainer
      dma: ipu_idmac: do not lose valid received data in the irq handler
      dmaengine: imx-sdma: fix up param for the last BD in sdma_prep_slave_sg()
      dmaengine: imx-sdma: correct sdmac->status in sdma_handle_channel_loop()
      dmaengine: imx-sdma: return sdmac->status in sdma_tx_status()
      dmaengine: imx-sdma: set sdmac->status to DMA_ERROR in err_out of sdma_prep_slave_sg()
      dmaengine: imx-sdma: remove IMX_DMA_SG_LOOP handling in sdma_prep_slave_sg()
      dmaengine i.MX dma: initialize dma capabilities outside channel loop
      dmaengine i.MX DMA: do not initialize chan_id field
      dmaengine i.MX dma: check sg entries for valid addresses and lengths
      dmaengine i.MX dma: set maximum segment size for our device
      dmaengine i.MX SDMA: reserve channel 0 by not registering it
      dmaengine i.MX SDMA: initialize dma capabilities outside channel loop
      dmaengine i.MX SDMA: do not initialize chan_id field
      dmaengine i.MX sdma: check sg entries for valid addresses and lengths
      dmaengine i.MX sdma: set maximum segment size for our device
      DMA: PL08x: fix channel pausing to timeout rather than lockup
      DMA: PL08x: fix infinite wait when terminating transfers
      dmaengine: imx-sdma: fix inconsistent naming in sdma_assign_cookie()
      dmaengine: imx-sdma: propagate error in sdma_probe() instead of returning 0
      ...
    b45bbf07