diff options
| author | Espen Fjellvær Olsen <espen@mrfjo.org> | 2013-01-08 20:53:54 +0100 |
|---|---|---|
| committer | Espen Fjellvær Olsen <espen@mrfjo.org> | 2013-01-09 18:01:06 +0100 |
| commit | 3698988b7d3542ae549ef3ab93173840d9137f2e (patch) | |
| tree | 6ebd4758df242bc66c7af05fa0b639c0a18ad9f5 /drivers/char | |
| parent | 843a1f4423b478f40fce2a3f891f240dc285bbb9 (diff) | |
| download | kernel_samsung_smdk4412-3698988b7d3542ae549ef3ab93173840d9137f2e.zip kernel_samsung_smdk4412-3698988b7d3542ae549ef3ab93173840d9137f2e.tar.gz kernel_samsung_smdk4412-3698988b7d3542ae549ef3ab93173840d9137f2e.tar.bz2 | |
Revert "exynos-mem: Add fimc1 to mmap whitelist check"
This reverts commit eaa468eae8c9d87e4c83b30d977e744b3e373613.
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/exynos_mem.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/char/exynos_mem.c b/drivers/char/exynos_mem.c index 658af9a..fdbaf4d 100644 --- a/drivers/char/exynos_mem.c +++ b/drivers/char/exynos_mem.c @@ -266,6 +266,12 @@ void cma_region_descriptor_add(const char *name, int start, int size) int exynos_mem_mmap(struct file *filp, struct vm_area_struct *vma) { + +/* Devices not having DMA CMA acess shouldn't be using this in any case at all */ +#ifndef CONFIG_DMA_CMA + return -EINVAL; +#endif + struct exynos_mem *mem = (struct exynos_mem *)filp->private_data; bool cacheable = mem->cacheable; dma_addr_t start = 0; @@ -303,9 +309,8 @@ int exynos_mem_mmap(struct file *filp, struct vm_area_struct *vma) * * Add exceptions as we go. */ - if(strcmp(b->name, "s3c-fimc") == 0 || - strcmp(b->name, "ion") == 0 || - strcmp(b->name, "fimc1") == 0) { + + if(strcmp(b->name, "s3c-fimc") == 0) { allowed = true; pr_info("[%s] Accessing space 0x%08x/0x%08x for '%s'\n", __func__, b->start, b->size, b->name); |