summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2018-01-31 13:51:21 +0530
committerVinod Koul <vinod.koul@intel.com>2018-01-31 13:51:21 +0530
commitcea0dd4d96e548b720657a5e38ef291be6d4fff3 (patch)
tree9384be575b9ec5738d08e30b8f7161de51030993
parentdb90305b1ffebf57abd2c05e27c2a30a893fb397 (diff)
parentdd54006feda4c9e3764f400f498309e430f3d4cf (diff)
downloadlinux-cea0dd4d96e548b720657a5e38ef291be6d4fff3.tar.bz2
Merge branch 'topic/timb' into for-linus
-rw-r--r--drivers/dma/timb_dma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 896bafb7a532..395c698edb4d 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -422,7 +422,7 @@ static int td_alloc_chan_resources(struct dma_chan *chan)
break;
else {
dev_err(chan2dev(chan),
- "Couldnt allocate any descriptors\n");
+ "Couldn't allocate any descriptors\n");
return -ENOMEM;
}
}