Commit 59b0fbdf authored by Vinod Koul's avatar Vinod Koul

Merge branch 'topic/at_xdmac' into for-linus

parents 005ce70b 35ca0ee4
...@@ -624,12 +624,12 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, ...@@ -624,12 +624,12 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
unsigned int sg_len, enum dma_transfer_direction direction, unsigned int sg_len, enum dma_transfer_direction direction,
unsigned long flags, void *context) unsigned long flags, void *context)
{ {
struct at_xdmac_chan *atchan = to_at_xdmac_chan(chan); struct at_xdmac_chan *atchan = to_at_xdmac_chan(chan);
struct at_xdmac_desc *first = NULL, *prev = NULL; struct at_xdmac_desc *first = NULL, *prev = NULL;
struct scatterlist *sg; struct scatterlist *sg;
int i; int i;
unsigned int xfer_size = 0; unsigned int xfer_size = 0;
unsigned long irqflags; unsigned long irqflags;
struct dma_async_tx_descriptor *ret = NULL; struct dma_async_tx_descriptor *ret = NULL;
if (!sgl) if (!sgl)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment