diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 11:13:21 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 11:13:21 -0400 |
| commit | 1ae105aa7416087f2920c35c3cd16831d0d09c9c (patch) | |
| tree | 935b2d7c2b902f77b37e38ec9108f905fb09f690 /drivers/dma/dmaengine.c | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| parent | 5a42fb93e6a33224774786691027ef2d9795c245 (diff) | |
Merge branch 'next' into for-linus-3.0
Diffstat (limited to 'drivers/dma/dmaengine.c')
| -rw-r--r-- | drivers/dma/dmaengine.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 8bcb15fb959d..f7f21a5de3e1 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -509,8 +509,8 @@ struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, v | |||
| 509 | dma_chan_name(chan)); | 509 | dma_chan_name(chan)); |
| 510 | list_del_rcu(&device->global_node); | 510 | list_del_rcu(&device->global_node); |
| 511 | } else if (err) | 511 | } else if (err) |
| 512 | pr_err("dmaengine: failed to get %s: (%d)\n", | 512 | pr_debug("dmaengine: failed to get %s: (%d)\n", |
| 513 | dma_chan_name(chan), err); | 513 | dma_chan_name(chan), err); |
| 514 | else | 514 | else |
| 515 | break; | 515 | break; |
| 516 | if (--device->privatecnt == 0) | 516 | if (--device->privatecnt == 0) |