aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 11:57:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-31 11:57:35 -0800
commit9de54606d3d55095e4426a81a79a41d8e5e5b6be (patch)
tree09c887299a82307f6ec5c2e334b9d55a44bd79cb /lib
parent952363c90c93e967c8e1819131b68cbb6f9c962f (diff)
parenta8fe9ea200ea21421ea750423d1d4d4f7ce037cf (diff)
downloadmrst-s0i3-test-9de54606d3d55095e4426a81a79a41d8e5e5b6be.tar.gz
mrst-s0i3-test-9de54606d3d55095e4426a81a79a41d8e5e5b6be.tar.xz
mrst-s0i3-test-9de54606d3d55095e4426a81a79a41d8e5e5b6be.zip
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
Diffstat (limited to 'lib')
-rw-r--r--lib/dma-debug.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 739974460c3..cf906201aec 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: