Skip to content

L
linux-davinci
Commit 9de54606 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'x86-fixes-for-linus-2' of... 

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
parents 952363c9 a8fe9ea2
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
lib/dma-debug.c
View file @ 9de54606
...@@ -670,14 +670,13 @@ static int device_dma_allocations(struct device *dev) ...@@ -670,14 +670,13 @@ static int device_dma_allocations(struct device *dev)
return count; return count;
} }
static int dma_debug_device_change(struct notifier_block *nb, static int dma_debug_device_change(struct notifier_block *nb, unsigned long action, void *data)
unsigned long action, void *data)
{ {
struct device *dev = data; struct device *dev = data;
int count; int count;
if (global_disable) if (global_disable)
return; return 0;
switch (action) { switch (action) {
case BUS_NOTIFY_UNBOUND_DRIVER: case BUS_NOTIFY_UNBOUND_DRIVER:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment