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)))