aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/g364fb.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-06-14 05:24:47 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-06-15 02:04:27 -0400
commit3b30f9f437eed6a1fd7f306fa0d2ab1e18e44a1f (patch)
tree435137924f2e8835599068f9771b02fd67797884 /drivers/video/g364fb.c
parentf316fe726a0edd3941111b61681bb8bbd4fda2e6 (diff)
g364fb: use display information in info not in var for panning
We must not use any information in the passed var besides xoffset, yoffset and vmode as otherwise applications might abuse it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/g364fb.c')
-rw-r--r--drivers/video/g364fb.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c
index d662317d85e..223896cc5f7 100644
--- a/drivers/video/g364fb.c
+++ b/drivers/video/g364fb.c
@@ -149,10 +149,11 @@ int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
149static int g364fb_pan_display(struct fb_var_screeninfo *var, 149static int g364fb_pan_display(struct fb_var_screeninfo *var,
150 struct fb_info *info) 150 struct fb_info *info)
151{ 151{
152 if (var->xoffset || var->yoffset + var->yres > var->yres_virtual) 152 if (var->xoffset ||
153 var->yoffset + info->var.yres > info->var.yres_virtual)
153 return -EINVAL; 154 return -EINVAL;
154 155
155 *(unsigned int *) TOP_REG = var->yoffset * var->xres; 156 *(unsigned int *) TOP_REG = var->yoffset * info->var.xres;
156 return 0; 157 return 0;
157} 158}
158 159