Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32cf8c1e authored by Antonino A. Daplas's avatar Antonino A. Daplas Committed by Linus Torvalds
Browse files

[PATCH] savagefb: Trim savagefb_pan_display 



Remove error checking and updating from savagefb_pan_display.  This is
guaranteed to be done by the core layer.

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 198a52a1

drivers/video/savage/savagefb_driver.c

+0 −20
Original line number Diff line number Diff line
@@ -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;

}