OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2009-12-31 11:57:35 -08:00
parent 952363c90c a8fe9ea200
commit 9de54606d3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/dma-debug.c
View File

@ -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: