diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 14:57:35 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-31 14:57:35 -0500 |
| commit | 9de54606d3d55095e4426a81a79a41d8e5e5b6be (patch) | |
| tree | 09c887299a82307f6ec5c2e334b9d55a44bd79cb /lib | |
| parent | 952363c90c93e967c8e1819131b68cbb6f9c962f (diff) | |
| parent | a8fe9ea200ea21421ea750423d1d4d4f7ce037cf (diff) | |
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.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: |