diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:08:03 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:08:03 +0800 |
| commit | 9ad8208bd7d0a5d9e232142d95f94bddc35ffff7 (patch) | |
| tree | 7cdc0808be3bf18db4c44aafc56d565770d297cb /lib | |
| parent | cf5ba83bb248452b5b320d8f2ee48bd90e5cf3f6 (diff) | |
| parent | c66b2190a13e321233ac1349d238d699dffefe09 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dma-debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 4a1515f4b452..51a76af25c66 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -657,9 +657,9 @@ static struct dma_debug_entry *dma_entry_alloc(void) spin_lock_irqsave(&free_entries_lock, flags); if (list_empty(&free_entries)) { - pr_err("DMA-API: debugging out of memory - disabling\n"); global_disable = true; spin_unlock_irqrestore(&free_entries_lock, flags); + pr_err("DMA-API: debugging out of memory - disabling\n"); return NULL; } |