diff options
author | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 08:10:46 -0400 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-02 08:10:46 -0400 |
commit | 592745e2f8afbaeafcf72645f0a2b0285644e091 (patch) | |
tree | 5deafbb5ba32bf7a4834af9b7c64d5f31ebfcb39 /drivers | |
parent | 355cdafe14d72c616dc804a756f3af4f4df4fe8c (diff) | |
parent | 303fd71d3fdf93c3d4fa7f0d72f93c21d9ced560 (diff) |
Merge branch 'topic/of' into for-linus
Diffstat (limited to 'drivers')
-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 0947ff64152e..d7d94d21a038 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) | |||
514 | /* lock against __dma_request_channel */ | 514 | /* lock against __dma_request_channel */ |
515 | mutex_lock(&dma_list_mutex); | 515 | mutex_lock(&dma_list_mutex); |
516 | 516 | ||
517 | if (chan->client_count == 0) | 517 | if (chan->client_count == 0) { |
518 | err = dma_chan_get(chan); | 518 | err = dma_chan_get(chan); |
519 | else | 519 | if (err) |
520 | pr_debug("%s: failed to get %s: (%d)\n", | ||
521 | __func__, dma_chan_name(chan), err); | ||
522 | } else | ||
520 | chan = NULL; | 523 | chan = NULL; |
521 | 524 | ||
522 | mutex_unlock(&dma_list_mutex); | 525 | mutex_unlock(&dma_list_mutex); |
523 | 526 | ||
524 | if (err) | ||
525 | pr_debug("%s: failed to get %s: (%d)\n", | ||
526 | __func__, dma_chan_name(chan), err); | ||
527 | 527 | ||
528 | return chan; | 528 | return chan; |
529 | } | 529 | } |
diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c index 75334bdd2c56..0b88dd3d05f4 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, | |||
160 | 160 | ||
161 | count = of_property_count_strings(np, "dma-names"); | 161 | count = of_property_count_strings(np, "dma-names"); |
162 | if (count < 0) { | 162 | if (count < 0) { |
163 | pr_err("%s: dma-names property missing or empty\n", __func__); | 163 | pr_err("%s: dma-names property of node '%s' missing or empty\n", |
164 | __func__, np->full_name); | ||
164 | return NULL; | 165 | return NULL; |
165 | } | 166 | } |
166 | 167 | ||