From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Thu, 24 Jul 2008 04:31:24 +0000 (-0700)
Subject: tdfxfb: remove ypan checks done by a higher layer
X-Git-Tag: v2.6.27-rc1~559
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c2c12155cf05bf3e25eeae5711beffc634505400;p=linux-2.6-omap-h63xx.git

tdfxfb: remove ypan checks done by a higher layer

These checks and assignments are done by a higher layer so remove them
from the driver.

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 67664252868..77aafcfae03 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -836,16 +836,12 @@ static int tdfxfb_pan_display(struct fb_var_screeninfo *var,
 	struct tdfx_par *par = info->par;
 	u32 addr = var->yoffset * info->fix.line_length;
 
-	if (nopan || var->xoffset || (var->yoffset > var->yres_virtual))
-		return -EINVAL;
-	if ((var->yoffset + var->yres > var->yres_virtual && nowrap))
+	if (nopan || var->xoffset)
 		return -EINVAL;
 
 	banshee_make_room(par, 1);
 	tdfx_outl(par, VIDDESKSTART, addr);
 
-	info->var.xoffset = var->xoffset;
-	info->var.yoffset = var->yoffset;
 	return 0;
 }