lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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()
This commit is contained in:
Linus Torvalds
2012-10-26 14:59:01 -07:00
parent 64b1cbaa10 26fd12209c
commit f761237eee
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma/imx-dma.c
View File

@@ -474,8 +474,10 @@ static int imxdma_xfer_desc(struct imxdma_desc *d)
slot = i; slot = i;
break; break;
} }
if (slot < 0) if (slot < 0) {
spin_unlock_irqrestore(&imxdma->lock, flags);
return -EBUSY; return -EBUSY;
}
imxdma->slots_2d[slot].xsr = d->x; imxdma->slots_2d[slot].xsr = d->x;
imxdma->slots_2d[slot].ysr = d->y; imxdma->slots_2d[slot].ysr = d->y;

4
drivers/dma/sirf-dma.c
View File

@@ -109,7 +109,7 @@ static void sirfsoc_dma_execute(struct sirfsoc_dma_chan *schan)
sdesc = list_first_entry(&schan->queued, struct sirfsoc_dma_desc, sdesc = list_first_entry(&schan->queued, struct sirfsoc_dma_desc,
node); node);
/* Move the first queued descriptor to active list */ /* Move the first queued descriptor to active list */
list_move_tail(&schan->queued, &schan->active); list_move_tail(&sdesc->node, &schan->active);
/* Start the DMA transfer */ /* Start the DMA transfer */
writel_relaxed(sdesc->width, sdma->base + SIRFSOC_DMA_WIDTH_0 + writel_relaxed(sdesc->width, sdma->base + SIRFSOC_DMA_WIDTH_0 +
@@ -428,7 +428,7 @@ static struct dma_async_tx_descriptor *sirfsoc_dma_prep_interleaved(
unsigned long iflags; unsigned long iflags;
int ret; int ret;
if ((xt->dir != DMA_MEM_TO_DEV) || (xt->dir != DMA_DEV_TO_MEM)) { if ((xt->dir != DMA_MEM_TO_DEV) && (xt->dir != DMA_DEV_TO_MEM)) {
ret = -EINVAL; ret = -EINVAL;
goto err_dir; goto err_dir;
} }