tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
"Three fixes for slave dmanegine.

Two are for typo omissions in sifr dmaengine driver and the last one
is for the imx driver fixing a missing unlock"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: sirf: fix a typo in moving running dma_desc to active queue
dmaengine: sirf: fix a typo in dma_prep_interleaved
dmaengine: imx-dma: fix missing unlock on error in imxdma_xfer_desc()

Linus Torvalds f761237e 64b1cbaa

+5 -3
+3 -1
drivers/dma/imx-dma.c
··· 474 474 slot = i; 475 475 break; 476 476 } 477 - if (slot < 0) 477 + if (slot < 0) { 478 + spin_unlock_irqrestore(&imxdma->lock, flags); 478 479 return -EBUSY; 480 + } 479 481 480 482 imxdma->slots_2d[slot].xsr = d->x; 481 483 imxdma->slots_2d[slot].ysr = d->y;
+2 -2
drivers/dma/sirf-dma.c
··· 109 109 sdesc = list_first_entry(&schan->queued, struct sirfsoc_dma_desc, 110 110 node); 111 111 /* Move the first queued descriptor to active list */ 112 - list_move_tail(&schan->queued, &schan->active); 112 + list_move_tail(&sdesc->node, &schan->active); 113 113 114 114 /* Start the DMA transfer */ 115 115 writel_relaxed(sdesc->width, sdma->base + SIRFSOC_DMA_WIDTH_0 + ··· 428 428 unsigned long iflags; 429 429 int ret; 430 430 431 - if ((xt->dir != DMA_MEM_TO_DEV) || (xt->dir != DMA_DEV_TO_MEM)) { 431 + if ((xt->dir != DMA_MEM_TO_DEV) && (xt->dir != DMA_DEV_TO_MEM)) { 432 432 ret = -EINVAL; 433 433 goto err_dir; 434 434 }