diff --git a/[refs] b/[refs] index 5c57d907d32f..3836855824f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d4b695fa32b707b40fe2dab6a21a39bd91f4615 +refs/heads/master: 7b116e54920ff9b8bf082fb3c371187ed075ac38 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; }