diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-08-23 18:54:22 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-08-23 18:54:22 +0530 |
| commit | 59b0fbdf15900abc57bd90f1cca1f6ff28b470c0 (patch) | |
| tree | b21da113b3d93ad8b376bcc23d266d8092388be3 /drivers | |
| parent | 005ce70b9448ed86c9a12e6504f1f9896a826e3d (diff) | |
| parent | 35ca0ee49d2973976f89f07eb842782a39d20a14 (diff) | |
Merge branch 'topic/at_xdmac' into for-linus
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/at_xdmac.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c index 99243f6a9c87..fbf573bcf98e 100644 --- a/drivers/dma/at_xdmac.c +++ b/drivers/dma/at_xdmac.c @@ -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 long flags, void *context) { - struct at_xdmac_chan *atchan = to_at_xdmac_chan(chan); - struct at_xdmac_desc *first = NULL, *prev = NULL; - struct scatterlist *sg; - int i; - unsigned int xfer_size = 0; - unsigned long irqflags; + struct at_xdmac_chan *atchan = to_at_xdmac_chan(chan); + struct at_xdmac_desc *first = NULL, *prev = NULL; + struct scatterlist *sg; + int i; + unsigned int xfer_size = 0; + unsigned long irqflags; struct dma_async_tx_descriptor *ret = NULL; if (!sgl) |