---

yaml
---
r: 114859
b: refs/heads/master
c: f928ac0
h: refs/heads/master
i:
  114857: 12e1548
  114855: 0b21af6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 486ff387c0f27030a3cfb142469ba140f2d8976e
+refs/heads/master: f928ac0a9810d46c8ba3bde7c969984340da9f5d

trunk/drivers/video/atmel_lcdfb.c

@@ -372,6 +372,13 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
 	var->transp.offset = var->transp.length = 0;
 	var->xoffset = var->yoffset = 0;
 
+	if (info->fix.smem_len) {
+		unsigned int smem_len = (var->xres_virtual * var->yres_virtual
+					 * ((var->bits_per_pixel + 7) / 8));
+		if (smem_len > info->fix.smem_len)
+			return -EINVAL;
+	}
+
 	/* Saturate vertical and horizontal timings at maximum values */
 	var->vsync_len = min_t(u32, var->vsync_len,
 			(ATMEL_LCDC_VPW >> ATMEL_LCDC_VPW_OFFSET) + 1);