From c65ca778ca2f180d9c9552e74adfd086d09d3151 Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Tue, 22 Sep 2009 16:47:41 -0700 Subject: [PATCH] --- yaml --- r: 164877 b: refs/heads/master c: 99e9e7d62becd6c7413a9e8fbda7f5b66adb5cbf h: refs/heads/master i: 164875: bf74f44e5a25ac156387f27239251c27ceabe7e5 v: v3 --- [refs] | 2 +- trunk/drivers/video/fbmem.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9ba80838ac7f..825cba760da8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff8147fe71246b81a48de5f37041b026b57d60ca +refs/heads/master: 99e9e7d62becd6c7413a9e8fbda7f5b66adb5cbf diff --git a/trunk/drivers/video/fbmem.c b/trunk/drivers/video/fbmem.c index a85c818be945..346f257215a7 100644 --- a/trunk/drivers/video/fbmem.c +++ b/trunk/drivers/video/fbmem.c @@ -871,8 +871,8 @@ fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) err = -EINVAL; if (err || !info->fbops->fb_pan_display || - var->yoffset + yres > info->var.yres_virtual || - var->xoffset + info->var.xres > info->var.xres_virtual) + var->yoffset > info->var.yres_virtual - yres || + var->xoffset > info->var.xres_virtual - info->var.xres) return -EINVAL; if ((err = info->fbops->fb_pan_display(var, info)))