aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/pm3fb.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-06-14 05:24:56 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-06-15 02:04:06 -0400
commit1fdb518f9f9c804d78e84a54ce1814fe9003bca4 (patch)
tree48fa1ae4e0bd253e35869fc03e89c193ac010f72 /drivers/video/pm3fb.c
parentdf2d79810930ead3112b4ebab86ea0f9229ccf70 (diff)
pm3fb: 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> Cc: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/pm3fb.c')
-rw-r--r--drivers/video/pm3fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/pm3fb.c b/drivers/video/pm3fb.c
index 6666f45a2f8c..8221b5b42da9 100644
--- a/drivers/video/pm3fb.c
+++ b/drivers/video/pm3fb.c
@@ -1147,9 +1147,9 @@ static int pm3fb_pan_display(struct fb_var_screeninfo *var,
1147 struct fb_info *info) 1147 struct fb_info *info)
1148{ 1148{
1149 struct pm3_par *par = info->par; 1149 struct pm3_par *par = info->par;
1150 const u32 xres = (var->xres + 31) & ~31; 1150 const u32 xres = (info->var.xres + 31) & ~31;
1151 1151
1152 par->base = pm3fb_shift_bpp(var->bits_per_pixel, 1152 par->base = pm3fb_shift_bpp(info->var.bits_per_pixel,
1153 (var->yoffset * xres) 1153 (var->yoffset * xres)
1154 + var->xoffset); 1154 + var->xoffset);
1155 PM3_WAIT(par, 1); 1155 PM3_WAIT(par, 1);