From 172a7847ae7d0e7a921fbf975de702c3ba7bba5a Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 25 May 2011 11:34:52 +0200 Subject: [PATCH] --- yaml --- r: 271197 b: refs/heads/master c: d8344e090c5adff3290925cbb040d20133b7f586 h: refs/heads/master i: 271195: 0b5bdb1fb894ada337eb6dbc44b8510a197d2dc4 v: v3 --- [refs] | 2 +- trunk/drivers/video/g364fb.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ffd053adc37c..e655c0510928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 465cb7e700e8564fd2d76d5c7f3703eb07659617 +refs/heads/master: d8344e090c5adff3290925cbb040d20133b7f586 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; }