FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-05 03:01:42 +00:00
Code Issues Actions Packages Projects 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

Browse Source 
* '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
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; 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: