diff --git a/[refs] b/[refs] index 23cbd4e1ea42..6f5c152c8f8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 198a52a1c490be89a8d5d130eda972630919e0af +refs/heads/master: 32cf8c1e50ac9d49f348e886c6e664cdc37aaead diff --git a/trunk/drivers/video/savage/savagefb_driver.c b/trunk/drivers/video/savage/savagefb_driver.c index baddd2b320bd..ab727eaa7f43 100644 --- a/trunk/drivers/video/savage/savagefb_driver.c +++ b/trunk/drivers/video/savage/savagefb_driver.c @@ -1382,28 +1382,8 @@ static int savagefb_pan_display (struct fb_var_screeninfo *var, struct fb_info *info) { struct savagefb_par *par = info->par; - u_int y_bottom; - - y_bottom = var->yoffset; - - if (!(var->vmode & FB_VMODE_YWRAP)) - y_bottom += var->yres; - - if (var->xoffset > (var->xres_virtual - var->xres)) - return -EINVAL; - if (y_bottom > info->var.yres_virtual) - return -EINVAL; savagefb_update_start (par, var); - - info->var.xoffset = var->xoffset; - info->var.yoffset = var->yoffset; - - if (var->vmode & FB_VMODE_YWRAP) - info->var.vmode |= FB_VMODE_YWRAP; - else - info->var.vmode &= ~FB_VMODE_YWRAP; - return 0; }