diff --git a/[refs] b/[refs] index faf1c899c1f1..2ea24931de09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4541dbe154c0703cf47c43389b3544884f5f3522 +refs/heads/master: 2883cebabbc4efc00408024d284a0230ad3af8a0 diff --git a/trunk/drivers/video/vfb.c b/trunk/drivers/video/vfb.c index bc67251f1a2f..bf2f78065cf9 100644 --- a/trunk/drivers/video/vfb.c +++ b/trunk/drivers/video/vfb.c @@ -395,8 +395,8 @@ static int vfb_pan_display(struct fb_var_screeninfo *var, || var->xoffset) return -EINVAL; } else { - if (var->xoffset + var->xres > info->var.xres_virtual || - var->yoffset + var->yres > info->var.yres_virtual) + if (var->xoffset + info->var.xres > info->var.xres_virtual || + var->yoffset + info->var.yres > info->var.yres_virtual) return -EINVAL; } info->var.xoffset = var->xoffset;