1 files changed, 7 insertions, 3 deletions

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index ce6b7eabf674..cf906201aecf 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -259,7 +259,7 @@ static struct dma_debug_entry *hash_bucket_find(struct hash_bucket *bucket,
                  * times. Without a hardware IOMMU this results in the
                  * same device addresses being put into the dma-debug
                  * hash multiple times too. This can result in false
-                 * positives being reported. Therfore we implement a
+                 * positives being reported. Therefore we implement a
                  * best-fit algorithm here which returns the entry from
                  * the hash which fits best to the reference value
                  * instead of the first-fit.
@@ -670,12 +670,13 @@ static int device_dma_allocations(struct device *dev)
         return count;
 }
 
-static int dma_debug_device_change(struct notifier_block *nb,
-                                    unsigned long action, void *data)
+static int dma_debug_device_change(struct notifier_block *nb, unsigned long action, void *data)
 {
         struct device *dev = data;
         int count;
 
+        if (global_disable)
+                return 0;
 
         switch (action) {
         case BUS_NOTIFY_UNBOUND_DRIVER:
@@ -697,6 +698,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");