1 files changed, 2 insertions, 7 deletions

diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 66ce41489133..d84beb994f36 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -120,11 +120,6 @@ static const char *type2name[4] = { "single", "page",
 static const char *dir2name[4] = { "DMA_BIDIRECTIONAL", "DMA_TO_DEVICE",
                                    "DMA_FROM_DEVICE", "DMA_NONE" };
 
-/* little merge helper - remove it after the merge window */
-#ifndef BUS_NOTIFY_UNBOUND_DRIVER
-#define BUS_NOTIFY_UNBOUND_DRIVER 0x0005
-#endif
-
 /*
  * The access to some variables in this macro is racy. We can't use atomic_t
  * here because all these variables are exported to debugfs. Some of them even
@@ -269,7 +264,7 @@ static struct dma_debug_entry *__hash_bucket_find(struct hash_bucket *bucket,
                                                   match_fn match)
 {
         struct dma_debug_entry *entry, *ret = NULL;
-        int matches = 0, match_lvl, last_lvl = 0;
+        int matches = 0, match_lvl, last_lvl = -1;
 
         list_for_each_entry(entry, &bucket->list, list) {
                 if (!match(ref, entry))
@@ -298,7 +293,7 @@ static struct dma_debug_entry *__hash_bucket_find(struct hash_bucket *bucket,
                 } else if (match_lvl > last_lvl) {
                         /*
                          * We found an entry that fits better then the
-                         * previous one
+                         * previous one or it is the 1st match.
                          */
                         last_lvl = match_lvl;
                         ret      = entry;