diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-12-31 09:16:23 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-31 09:16:23 -0500 |
commit | a8fe9ea200ea21421ea750423d1d4d4f7ce037cf (patch) | |
tree | f351dc2c5804ba6e8571574bf323e7b2162f9276 /lib | |
parent | f405d2c02395a74d3883bd03ded36457aa3697ad (diff) |
dma-debug: Fix bug causing build warning
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>
Cc: <stable@kernel.org>
LKML-Reference: <20091231125624.GA14666@liondog.tnic>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'lib')
-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 739974460c32..cf906201aecf 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
@@ -670,14 +670,13 @@ static int device_dma_allocations(struct device *dev) | |||
670 | return count; | 670 | return count; |
671 | } | 671 | } |
672 | 672 | ||
673 | static int dma_debug_device_change(struct notifier_block *nb, | 673 | static int dma_debug_device_change(struct notifier_block *nb, unsigned long action, void *data) |
674 | unsigned long action, void *data) | ||
675 | { | 674 | { |
676 | struct device *dev = data; | 675 | struct device *dev = data; |
677 | int count; | 676 | int count; |
678 | 677 | ||
679 | if (global_disable) | 678 | if (global_disable) |
680 | return; | 679 | return 0; |
681 | 680 | ||
682 | switch (action) { | 681 | switch (action) { |
683 | case BUS_NOTIFY_UNBOUND_DRIVER: | 682 | case BUS_NOTIFY_UNBOUND_DRIVER: |