summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2018-12-31 19:31:47 +0530
committerVinod Koul <vkoul@kernel.org>2018-12-31 19:31:47 +0530
commitb7ff66ca30f88dfd63763d12b848520baddc5ae5 (patch)
treeac84354c99026919e89ac48e50936c3d6867fd63 /drivers/dma
parent010299bfc2df19c2c330c75c048805939e5ab91b (diff)
parent9b68cc012a73b9333863436ac876561674035ee0 (diff)
downloadlinux-b7ff66ca30f88dfd63763d12b848520baddc5ae5.tar.bz2
Merge branch 'topic/ep93xx' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/ep93xx_dma.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c
index f674eb5fbbef..594a88f4f99c 100644
--- a/drivers/dma/ep93xx_dma.c
+++ b/drivers/dma/ep93xx_dma.c
@@ -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;
}