diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:06:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:06:48 +0800 |
| commit | 1beb6ea36b283c1dc34812c6ef9bf56a1e494f8c (patch) | |
| tree | 539dc6f4b8c68f385a6457ef7b9d15570a0a8dcc /lib | |
| parent | 6c1be3bf831c5b1f2ba51425315287df2c350633 (diff) | |
| parent | b5076139991c6b12c62346d9880eec1d4227d99f (diff) | |
Merge tag 'v3.18.35' into linux-linaro-lsk-v3.18
This is the 3.18.35 stable release
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 1ff0fd098504..c83ac43418be 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -646,9 +646,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; } |