From ba8f66196931acf45c0ea0af0e3291cabf4e5651 Mon Sep 17 00:00:00 2001 From: Ville Syrjala Date: Wed, 23 Jul 2008 21:31:28 -0700 Subject: [PATCH] --- yaml --- r: 105543 b: refs/heads/master c: 7572a1ea034a8fc45e57de28cc7573264975532a h: refs/heads/master i: 105541: 619b4ed6a8c83f9fc1c9c56227bff250c0fd8e22 105539: ab39e7c9df4dde964a75f0842be716558b49684a 105535: 16a3840973a3772911e152efc38d89c795c53270 v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a481a53c2aaf..58b7fc59bb80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43a3abc6aca8505e708508e2c7c2f99a7f8f820b +refs/heads/master: 7572a1ea034a8fc45e57de28cc7573264975532a diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index 1cd5071e5362..6b487801eeae 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -848,9 +848,8 @@ int fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) { struct fb_fix_screeninfo *fix = &info->fix; - int xoffset = var->xoffset; - int yoffset = var->yoffset; - int err = 0, yres = info->var.yres; + unsigned int yres = info->var.yres; + int err = 0; if (var->yoffset > 0) { if (var->vmode & FB_VMODE_YWRAP) { @@ -866,8 +865,8 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) (var->xoffset % fix->xpanstep))) err = -EINVAL; - if (err || !info->fbops->fb_pan_display || xoffset < 0 || - yoffset < 0 || var->yoffset + yres > info->var.yres_virtual || + if (err || !info->fbops->fb_pan_display || + var->yoffset + yres > info->var.yres_virtual || var->xoffset + info->var.xres > info->var.xres_virtual) return -EINVAL;