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;