From 0aca9d2fd513ab1a7976f6c64dd9402a6f81241d Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Wed, 24 Apr 2013 08:35:20 +0300
Subject: [PATCH] --- yaml --- r: 362955 b: refs/heads/master c:
 138f296e140f79cb955caba70690076fb14e6f6d h: refs/heads/master i:   362953:
 3835f38b280f82db26989a8eda20ae601c3d7e83   362951:
 cd49bf699ea1c39ca2e0cca3b429a5e5067e3686 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/video/fbmem.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 94bf0cc2b001..8f87f4358641 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04f8afbec37f63fafce16e454a7848426aa36202
+refs/heads/master: 138f296e140f79cb955caba70690076fb14e6f6d
diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c
index 86291dcd964a..dcb669eb4532 100644
--- a/trunk/drivers/video/fbmem.c
+++ b/trunk/drivers/video/fbmem.c
@@ -1398,6 +1398,11 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
 	len = info->fix.smem_len;
 	mmio_pgoff = PAGE_ALIGN((start & ~PAGE_MASK) + len) >> PAGE_SHIFT;
 	if (vma->vm_pgoff >= mmio_pgoff) {
+		if (info->var.accel_flags) {
+			mutex_unlock(&info->mm_lock);
+			return -EINVAL;
+		}
+
 		vma->vm_pgoff -= mmio_pgoff;
 		start = info->fix.mmio_start;
 		len = info->fix.mmio_len;