From 398e88950bf563af9be882f27061cded3d1cddff Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:46 +0000
Subject: [PATCH] --- yaml --- r: 271246 b: refs/heads/master c:
 aa7984cf51875bbb867485a72817bca5162fe80d h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/video/fb-puv3.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ee707569b463..2b9a2c3f2c21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dbe8514fdb9ec6c82aa295c57886dfcf17574f1
+refs/heads/master: aa7984cf51875bbb867485a72817bca5162fe80d
diff --git a/trunk/drivers/video/fb-puv3.c b/trunk/drivers/video/fb-puv3.c
index 27f2c57e06e9..60a787fa32cf 100644
--- a/trunk/drivers/video/fb-puv3.c
+++ b/trunk/drivers/video/fb-puv3.c
@@ -624,8 +624,8 @@ static int unifb_pan_display(struct fb_var_screeninfo *var,
 		    || var->xoffset)
 			return -EINVAL;
 	} else {
-		if (var->xoffset + var->xres > info->var.xres_virtual ||
-		    var->yoffset + var->yres > info->var.yres_virtual)
+		if (var->xoffset + info->var.xres > info->var.xres_virtual ||
+		    var->yoffset + info->var.yres > info->var.yres_virtual)
 			return -EINVAL;
 	}
 	info->var.xoffset = var->xoffset;