diff --git a/[refs] b/[refs] index e655c0510928..5c57d907d32f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d8344e090c5adff3290925cbb040d20133b7f586 +refs/heads/master: 1d4b695fa32b707b40fe2dab6a21a39bd91f4615 diff --git a/trunk/drivers/video/gxt4500.c b/trunk/drivers/video/gxt4500.c index 896e53dea906..0fad23f810a3 100644 --- a/trunk/drivers/video/gxt4500.c +++ b/trunk/drivers/video/gxt4500.c @@ -543,8 +543,8 @@ static int gxt4500_pan_display(struct fb_var_screeninfo *var, if (var->xoffset & 7) return -EINVAL; - if (var->xoffset + var->xres > var->xres_virtual || - var->yoffset + var->yres > var->yres_virtual) + if (var->xoffset + info->var.xres > info->var.xres_virtual || + var->yoffset + info->var.yres > info->var.yres_virtual) return -EINVAL; writereg(par, REFRESH_START, (var->xoffset << 16) | var->yoffset);