summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-06-14 09:24:55 +0000
committerPaul Mundt <lethal@linux-sh.org>2011-06-15 15:03:33 +0900
commitdf9306de45529f02d18a1a16b8685ef5c90f98f7 (patch)
tree535d60b83abb4cfae981f362d4c21ee95c1afa36
parentc2d340a403f08e57fb76e738e691fe466a38a8c8 (diff)
downloadop-kernel-dev-df9306de45529f02d18a1a16b8685ef5c90f98f7.zip
op-kernel-dev-df9306de45529f02d18a1a16b8685ef5c90f98f7.tar.gz
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>
-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 27f93aa..f4f8ce8 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,
{
struct pm2fb_par *p = info->par;
u32 base;
- u32 depth = (var->bits_per_pixel + 7) & ~7;
- u32 xres = (var->xres + 31) & ~31;
+ u32 depth = (info->var.bits_per_pixel + 7) & ~7;
+ u32 xres = (info->var.xres + 31) & ~31;
depth = (depth > 32) ? 32 : depth;
base = to3264(var->yoffset * xres + var->xoffset, depth, 1);
OpenPOWER on IntegriCloud