From b2408a2b75d5c727ca028ff75974f7adb9db0a45 Mon Sep 17 00:00:00 2001 From: Richard Genoud Date: Fri, 31 May 2013 14:28:38 +0000 Subject: [PATCH] --- yaml --- r: 376501 b: refs/heads/master c: 65ac057bce426b4abdf42384c4e09e40a634df32 h: refs/heads/master i: 376499: 7f237a6d47a2312890f9cab8440c3bb2939e271d v: v3 --- [refs] | 2 +- trunk/drivers/video/atmel_lcdfb.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e3a4b680c046..17074a6f4501 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2436e8aa8abef2536dc3bfb554f8dcb3a8b07560 +refs/heads/master: 65ac057bce426b4abdf42384c4e09e40a634df32 diff --git a/trunk/drivers/video/atmel_lcdfb.c b/trunk/drivers/video/atmel_lcdfb.c index 540909de6247..6e6491fb83b7 100644 --- a/trunk/drivers/video/atmel_lcdfb.c +++ b/trunk/drivers/video/atmel_lcdfb.c @@ -461,8 +461,11 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var, 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) + if (smem_len > info->fix.smem_len) { + dev_err(dev, "Frame buffer is too small (%u) for screen size (need at least %u)\n", + info->fix.smem_len, smem_len); return -EINVAL; + } } /* Saturate vertical and horizontal timings at maximum values */