From 67974e6f3c725c8f4d380d33563a96310b1067e7 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 14 Jun 2011 09:24:39 +0000
Subject: [PATCH] --- yaml --- r: 271251 b: refs/heads/master c:
 c6990b775d543c432f968808119d7fe33d506a71 h: refs/heads/master i:   271249:
 b4680191e166fb508e0368fdcb17f96c70cc7b63   271247:
 4c9109854dc94bf40d49077b0f872cf334db3fa2 v: v3

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

diff --git a/[refs] b/[refs]
index b5e6f8824455..88be0ae2dc6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b8067f202b9dc0b6baea1dee918d95e3112f2a5
+refs/heads/master: c6990b775d543c432f968808119d7fe33d506a71
diff --git a/trunk/drivers/video/68328fb.c b/trunk/drivers/video/68328fb.c
index 75a39eab70c3..a425d65d5ba2 100644
--- a/trunk/drivers/video/68328fb.c
+++ b/trunk/drivers/video/68328fb.c
@@ -378,8 +378,8 @@ static int mc68x328fb_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;