diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-31 15:16:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-06 15:03:52 -0800 |
| commit | 6cb5fcc95450e4a8e7423128dec3d43caac8f42b (patch) | |
| tree | b0716d2a1c949f648a5c673a07d6993c8d44239e /lib/dma-debug.c | |
| parent | 120dbaa5f31dfea13be03da90d90dc2cfed77841 (diff) | |
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 <sruffell@digium.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <20091231125624.GA14666@liondog.tnic>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index dcd43e30968..5a77c7cfb59 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: |