Merge tag 'v3.10.103' into update

This is the 3.10.103 stable release
2018-03-21 22:58:21 +01:00
parent a8732f92e3 2ecaf1d025
commit b9e7bc93d6
156 changed files with 1693 additions and 1183 deletions
@@ -445,9 +445,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;
 	}