diff --git a/[refs] b/[refs] index b0dde0d826a4..b29e6ffda53a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff55fe9ac19d800bfab02bc877c06e74f3e2537d +refs/heads/master: df2d79810930ead3112b4ebab86ea0f9229ccf70 diff --git a/trunk/drivers/video/hgafb.c b/trunk/drivers/video/hgafb.c index 4052718eefaa..4394389caf68 100644 --- a/trunk/drivers/video/hgafb.c +++ b/trunk/drivers/video/hgafb.c @@ -422,8 +422,8 @@ static int hgafb_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 || var->yoffset % 8) return -EINVAL; }