aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/pm2fb.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-06-14 05:24:55 -0400
committerPaul Mundt <lethal@linux-sh.org>2011-06-15 02:03:33 -0400
commitdf9306de45529f02d18a1a16b8685ef5c90f98f7 (patch)
tree535d60b83abb4cfae981f362d4c21ee95c1afa36 /drivers/video/pm2fb.c
parentc2d340a403f08e57fb76e738e691fe466a38a8c8 (diff)
pm2fb: 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/pm2fb.c')
-rw-r--r--drivers/video/pm2fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 27f93aab6ddc..f4f8ce802d02 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -973,8 +973,8 @@ static int pm2fb_pan_display(struct fb_var_screeninfo *var,
973{ 973{
974 struct pm2fb_par *p = info->par; 974 struct pm2fb_par *p = info->par;
975 u32 base; 975 u32 base;
976 u32 depth = (var->bits_per_pixel + 7) & ~7; 976 u32 depth = (info->var.bits_per_pixel + 7) & ~7;
977 u32 xres = (var->xres + 31) & ~31; 977 u32 xres = (info->var.xres + 31) & ~31;
978 978
979 depth = (depth > 32) ? 32 : depth; 979 depth = (depth > 32) ? 32 : depth;
980 base = to3264(var->yoffset * xres + var->xoffset, depth, 1); 980 base = to3264(var->yoffset * xres + var->xoffset, depth, 1);