diff options
| author | sbrissen <sbrissen@hotmail.com> | 2013-12-13 14:35:25 -0500 |
|---|---|---|
| committer | sbrissen <sbrissen@hotmail.com> | 2013-12-13 14:38:32 -0500 |
| commit | cb45b00f2febffb7711f898f2e98e7f53a0c84ba (patch) | |
| tree | 0eb45d98cb6f4ca92b3101dca3c639dcc0b033df | |
| parent | 597a7ceb1581d2029c2472e2971bcc49b996810a (diff) | |
| download | kernel_samsung_smdk4412-cb45b00f2febffb7711f898f2e98e7f53a0c84ba.zip kernel_samsung_smdk4412-cb45b00f2febffb7711f898f2e98e7f53a0c84ba.tar.gz kernel_samsung_smdk4412-cb45b00f2febffb7711f898f2e98e7f53a0c84ba.tar.bz2 | |
smdk4412: revert jpeg_dev from update 11
fixes front cam for some that broke from update 11 merge
http://forum.xda-developers.com/showpost.php?p=48429637&postcount=576
Change-Id: I4a654f10e9ccd50a744a710ecd01d2d26f67401d
| -rw-r--r-- | drivers/media/video/samsung/jpeg/jpeg_dev.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/media/video/samsung/jpeg/jpeg_dev.c b/drivers/media/video/samsung/jpeg/jpeg_dev.c index 6ebcfb6..4038fd2 100644 --- a/drivers/media/video/samsung/jpeg/jpeg_dev.c +++ b/drivers/media/video/samsung/jpeg/jpeg_dev.c @@ -31,7 +31,6 @@ #include <linux/clk.h> #include <linux/semaphore.h> #include <linux/vmalloc.h> -#include <linux/cma.h> #include <asm/page.h> #include <linux/sched.h> @@ -248,12 +247,6 @@ int jpeg_mmap(struct file *filp, struct vm_area_struct *vma) size = vma->vm_end - vma->vm_start; - if (!cma_is_registered_region(jpeg_ctrl->mem.base, size)) { - pr_err("[%s] handling non-cma region (%#x@%#x)is prohibited\n", - __func__, (unsigned int)size, jpeg_ctrl->mem.base); - return -EINVAL; - } - vma->vm_flags |= VM_RESERVED | VM_IO; vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); |