Merge branch 'dma-debug/fixes' of git://git.kernel.org/pub/scm/linux/…

…kernel/git/joro/linux-2.6-iommu into core/urgent
git-mirror · Jul 3, 2009 · c222dce · c222dce
2 parents f6faac7 + b0a5b83
commit c222dce
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
@@ -716,7 +716,7 @@ void dma_debug_init(u32 num_entries)
 
 	for (i = 0; i < HASH_SIZE; ++i) {
 		INIT_LIST_HEAD(&dma_entry_hash[i].list);
-		dma_entry_hash[i].lock = SPIN_LOCK_UNLOCKED;
+		spin_lock_init(&dma_entry_hash[i].lock);
 	}
 
 	if (dma_debug_fs_init() != 0) {
@@ -862,7 +862,7 @@ static inline bool overlap(void *addr, u64 size, void *start, void *end)
 
 	return ((addr >= start && addr < end) ||
 		(addr2 >= start && addr2 < end) ||
-		((addr < start) && (addr2 >= end)));
+		((addr < start) && (addr2 > end)));
 }
 
 static void check_for_illegal_area(struct device *dev, void *addr, u64 size)