diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-03 10:01:44 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-03 10:01:44 -0700 |
| commit | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (patch) | |
| tree | 85f506cf9fce3d8fd47cf624dd8698472bffc13f /lib/dma-debug.c | |
| parent | Input: synaptics - fix handling of disabling gesture mode (diff) | |
| parent | Input: elan_i2c - use iap_version to get firmware information (diff) | |
| download | wireguard-linux-01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba.tar.xz wireguard-linux-01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba.zip | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.3 merge window.
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 9722bd2dbc9b..dace71fe41f7 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c @@ -361,7 +361,7 @@ static struct dma_debug_entry *bucket_find_contain(struct hash_bucket **bucket, unsigned int range = 0; while (range <= max_range) { - entry = __hash_bucket_find(*bucket, &index, containing_match); + entry = __hash_bucket_find(*bucket, ref, containing_match); if (entry) return entry; @@ -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; |