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

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

[PATCH] vga16fb: Trim vga16fb_pan_display 



Remove error checking and updating from vga16fb_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 e53f87a0

drivers/video/vga16fb.c

+0 −8
Original line number Diff line number Diff line
@@ -705,15 +705,7 @@ static int vga16fb_setcolreg(unsigned regno, unsigned red, unsigned green, 
static int vga16fb_pan_display(struct fb_var_screeninfo *var,

			       struct fb_info *info) 

{

	if (var->xoffset + info->var.xres > info->var.xres_virtual ||

	    var->yoffset + info->var.yres > info->var.yres_virtual)

		return -EINVAL;



	vga16fb_pan_var(info, var);



	info->var.xoffset = var->xoffset;

	info->var.yoffset = var->yoffset;

	info->var.vmode &= ~FB_VMODE_YWRAP;

	return 0;

}