From b4680191e166fb508e0368fdcb17f96c70cc7b63 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 14 Jun 2011 09:24:47 +0000 Subject: [PATCH] --- yaml --- r: 271249 b: refs/heads/master c: 3b30f9f437eed6a1fd7f306fa0d2ab1e18e44a1f h: refs/heads/master i: 271247: 4c9109854dc94bf40d49077b0f872cf334db3fa2 v: v3 --- [refs] | 2 +- trunk/drivers/video/g364fb.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f9e9c42abe09..fef5867eafbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f316fe726a0edd3941111b61681bb8bbd4fda2e6 +refs/heads/master: 3b30f9f437eed6a1fd7f306fa0d2ab1e18e44a1f diff --git a/trunk/drivers/video/g364fb.c b/trunk/drivers/video/g364fb.c index d662317d85e3..223896cc5f7d 100644 --- a/trunk/drivers/video/g364fb.c +++ b/trunk/drivers/video/g364fb.c @@ -149,10 +149,11 @@ int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor) static int g364fb_pan_display(struct fb_var_screeninfo *var, struct fb_info *info) { - if (var->xoffset || var->yoffset + var->yres > var->yres_virtual) + if (var->xoffset || + var->yoffset + info->var.yres > info->var.yres_virtual) return -EINVAL; - *(unsigned int *) TOP_REG = var->yoffset * var->xres; + *(unsigned int *) TOP_REG = var->yoffset * info->var.xres; return 0; }