summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorJoonsoo Kim <iamjoonsoo.kim@lge.com>2014-05-29 15:29:18 +0900
committerMarek Szyprowski <m.szyprowski@samsung.com>2014-05-29 09:25:14 +0200
commitf70e3c4f8b6ab61f713e040822ec51f5de498146 (patch)
tree37664fdf197609d2d445e6bde8d0e96fa6928ef4 /drivers/base
parentbb56d0dc23aa3428c0b1901414bfcf698eb693fb (diff)
downloadop-kernel-dev-f70e3c4f8b6ab61f713e040822ec51f5de498146.zip
op-kernel-dev-f70e3c4f8b6ab61f713e040822ec51f5de498146.tar.gz
CMA: correct unlock target
'cma: Remove potential deadlock situation' introduces per cma area mutex for bitmap management. It is good, but there is one mistake. When we can't find appropriate area in bitmap, we release cma_mutex global lock rather than cma->lock and this is a bug. So fix it. Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/dma-contiguous.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 7b0217c..c34ec33 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -309,7 +309,7 @@ struct page *dma_alloc_from_contiguous(struct device *dev, int count,
pageno = bitmap_find_next_zero_area(cma->bitmap, cma->count,
start, count, mask);
if (pageno >= cma->count) {
- mutex_unlock(&cma_mutex);
+ mutex_unlock(&cma->lock);
break;
}
bitmap_set(cma->bitmap, pageno, count);
OpenPOWER on IntegriCloud