Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9de54606 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

lib/dma-debug.c

+2 −3
Original line number Diff line number Diff line
@@ -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: