Merge branch 'topic/ep93xx' into for-linus
This commit is contained in:
commit
b7ff66ca30
|
@ -997,7 +997,7 @@ ep93xx_dma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest,
|
|||
for (offset = 0; offset < len; offset += bytes) {
|
||||
desc = ep93xx_dma_desc_get(edmac);
|
||||
if (!desc) {
|
||||
dev_warn(chan2dev(edmac), "couln't get descriptor\n");
|
||||
dev_warn(chan2dev(edmac), "couldn't get descriptor\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
@ -1069,7 +1069,7 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
|
|||
|
||||
desc = ep93xx_dma_desc_get(edmac);
|
||||
if (!desc) {
|
||||
dev_warn(chan2dev(edmac), "couln't get descriptor\n");
|
||||
dev_warn(chan2dev(edmac), "couldn't get descriptor\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
@ -1149,7 +1149,7 @@ ep93xx_dma_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
|
|||
for (offset = 0; offset < buf_len; offset += period_len) {
|
||||
desc = ep93xx_dma_desc_get(edmac);
|
||||
if (!desc) {
|
||||
dev_warn(chan2dev(edmac), "couln't get descriptor\n");
|
||||
dev_warn(chan2dev(edmac), "couldn't get descriptor\n");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue