diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:35:24 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 15:35:24 +0200 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /lib/dma-debug.c | |
| parent | Merge branches 'for-4.2/upstream-fixes-devm-fixed' and 'for-4.3/upstream' into for-linus (diff) | |
| parent | HID: gembird: add new driver to fix Gembird JPD-DualForce 2 (diff) | |
| download | wireguard-linux-067e2601d3c076abbf45db91261f9065eaa879b2.tar.xz wireguard-linux-067e2601d3c076abbf45db91261f9065eaa879b2.zip | |
Merge branch 'for-4.3/gembird' into for-linus
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index ae4b65e17e64..dace71fe41f7 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -574,6 +574,9 @@ void debug_dma_assert_idle(struct page *page) unsigned long flags; phys_addr_t cln; + if (dma_debug_disabled()) + return; + if (!page) return; |