Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/…

…linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: dma-debug: Fix bug causing build warning
git-mirror · Dec 31, 2009 · 9de5460 · 9de5460
2 parents 952363c + a8fe9ea
commit 9de5460
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
@@ -670,14 +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;
+		return 0;
 
 	switch (action) {
 	case BUS_NOTIFY_UNBOUND_DRIVER: