From: Ingo Molnar Date: Thu, 31 Dec 2009 14:16:23 +0000 (+0100) Subject: dma-debug: Fix bug causing build warning X-Git-Tag: v2.6.32.3~67 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6cb5fcc95450e4a8e7423128dec3d43caac8f42b;p=karo-tx-linux.git dma-debug: Fix bug causing build warning commit a8fe9ea200ea21421ea750423d1d4d4f7ce037cf upstream. Stephen Rothwell reported the following build warning: lib/dma-debug.c: In function 'dma_debug_device_change': lib/dma-debug.c:680: warning: 'return' with no value, in function returning non-void Introduced by commit f797d9881b62c2ddb1d2e7bd80d87141949c84aa ("dma-debug: Do not add notifier when dma debugging is disabled"). Return 0 [notify-done] when disabled. (this is standard bus notifier behavior.) Signed-off-by: Shaun Ruffell Signed-off-by: Joerg Roedel Cc: Linus Torvalds LKML-Reference: <20091231125624.GA14666@liondog.tnic> Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- diff --git a/lib/dma-debug.c b/lib/dma-debug.c index dcd43e30968e..5a77c7cfb59e 100644 --- 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: