| commit | 87e05265791b81ab43bc703304346e942af6f7e5 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Feb 27 14:21:29 2014 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Feb 27 14:21:28 2014 -0800 |
| tree | fb2140f81d4000ec311aa0a6c54b6d5ec6b4dc92 | |
| parent | 285fa71d7d7235e901e619939972f2756a76448a [diff] | |
| parent | 5adb04cbe4f7a4d74379d3468c6c253204576d14 [diff] |
Merge "cma: Remove potential deadlock situation"
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c index 885721f..606383a 100644 --- a/drivers/base/dma-contiguous.c +++ b/drivers/base/dma-contiguous.c
@@ -547,9 +547,9 @@ VM_BUG_ON(pfn + count > cma->base_pfn + cma->count); + free_contig_range(pfn, count); mutex_lock(&cma_mutex); bitmap_clear(cma->bitmap, pfn - cma->base_pfn, count); - free_contig_range(pfn, count); mutex_unlock(&cma_mutex); return true;