diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 17:40:46 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 17:40:46 +0530 |
| commit | 592745e2f8afbaeafcf72645f0a2b0285644e091 (patch) | |
| tree | 5deafbb5ba32bf7a4834af9b7c64d5f31ebfcb39 /drivers/dma | |
| parent | 355cdafe14d72c616dc804a756f3af4f4df4fe8c (diff) | |
| parent | 303fd71d3fdf93c3d4fa7f0d72f93c21d9ced560 (diff) | |
| download | op-kernel-dev-592745e2f8afbaeafcf72645f0a2b0285644e091.zip op-kernel-dev-592745e2f8afbaeafcf72645f0a2b0285644e091.tar.gz | |
Merge branch 'topic/of' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/dmaengine.c | 10 | ||||
| -rw-r--r-- | drivers/dma/of-dma.c | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 0947ff6..d7d94d2 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -514,16 +514,16 @@ struct dma_chan *dma_get_slave_channel(struct dma_chan *chan) /* lock against __dma_request_channel */ mutex_lock(&dma_list_mutex); - if (chan->client_count == 0) + if (chan->client_count == 0) { err = dma_chan_get(chan); - else + if (err) + pr_debug("%s: failed to get %s: (%d)\n", + __func__, dma_chan_name(chan), err); + } else chan = NULL; mutex_unlock(&dma_list_mutex); - if (err) - pr_debug("%s: failed to get %s: (%d)\n", - __func__, dma_chan_name(chan), err); return chan; } diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index 75334bd..0b88dd3 100644 --- a/drivers/dma/of-dma.c +++ b/drivers/dma/of-dma.c @@ -160,7 +160,8 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, count = of_property_count_strings(np, "dma-names"); if (count < 0) { - pr_err("%s: dma-names property missing or empty\n", __func__); + pr_err("%s: dma-names property of node '%s' missing or empty\n", + __func__, np->full_name); return NULL; } |
