diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:07:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-14 17:07:59 +0800 |
| commit | c66b2190a13e321233ac1349d238d699dffefe09 (patch) | |
| tree | a1f76b34bb49ac4a787029307085ee005a547f0d /lib | |
| parent | 37aa27cffb68b92b8f42d1a9f6300ed758d07552 (diff) | |
| parent | ba760d4302e4fce130007b8bdbce7fcafc9bd9a9 (diff) | |
Merge tag 'v4.4.13' into linux-linaro-lsk-v4.4
This is the 4.4.13 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 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; } |