From 59a534c09e6bfc091b6e731a40c698964ea8e259 Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 21 Dec 2009 15:58:19 +0100
Subject: [PATCH] --- yaml --- r: 178687 b: refs/heads/master c:
 ce9277fb08e6e721482f7011ca28dcd0449b197c h: refs/heads/master i:   178685:
 e3453c782e23e2c2353bba4d1813d1f28f127509   178683:
 d88fe3b5e8585e634e5b137dc04b71da3cd3d8d2   178679:
 92d0b96bf24a7c2f258d6eb53e09d447325f88a0   178671:
 4ecee170b398045148da967a95b5167e02577089   178655:
 610a9d30768df168daa595e19c7fb6cc245a6af7   178623:
 2fe96def4cb0f142bb901a563bf8ef8052d9c3f7   178559:
 8ef8a03fa5372d0ebf60df80aa9800f5870bc791   178431:
 4ed662c0a38a080da6c46f92fb907292f8101cce   178175:
 9822ac4c7298ee1edf14ab428607c665c683d291 v: v3

---
 [refs]                | 2 +-
 trunk/lib/dma-debug.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1db0171f888..a6ab7cedb0fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f764806438d5576ac58898332e5dcf30bb8a679
+refs/heads/master: ce9277fb08e6e721482f7011ca28dcd0449b197c
diff --git a/trunk/lib/dma-debug.c b/trunk/lib/dma-debug.c
index d9b08e0f7f55..739974460c32 100644
--- a/trunk/lib/dma-debug.c
+++ b/trunk/lib/dma-debug.c
@@ -676,6 +676,8 @@ static int dma_debug_device_change(struct notifier_block *nb,
 	struct device *dev = data;
 	int count;
 
+	if (global_disable)
+		return;
 
 	switch (action) {
 	case BUS_NOTIFY_UNBOUND_DRIVER:
@@ -697,6 +699,9 @@ void dma_debug_add_bus(struct bus_type *bus)
 {
 	struct notifier_block *nb;
 
+	if (global_disable)
+		return;
+
 	nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
 	if (nb == NULL) {
 		pr_err("dma_debug_add_bus: out of memory\n");