From patchwork Wed May 25 22:58:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 818632 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4PMwAsp026945 for ; Wed, 25 May 2011 22:58:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932072Ab1EYW6U (ORCPT ); Wed, 25 May 2011 18:58:20 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:53778 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756961Ab1EYW6R (ORCPT ); Wed, 25 May 2011 18:58:17 -0400 Received: from localhost.localdomain (unknown [91.178.57.18]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 90D0435B62; Wed, 25 May 2011 22:58:13 +0000 (UTC) From: Laurent Pinchart To: linux-fbdev@vger.kernel.org Cc: Ben Dooks Subject: [PATCH 23/29] sm501fb: use display information in info not in var for panning Date: Thu, 26 May 2011 00:58:15 +0200 Message-Id: <1306364301-8195-24-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <201105232211.40154.laurent.pinchart@ideasonboard.com> References: <201105232211.40154.laurent.pinchart@ideasonboard.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 25 May 2011 22:58:20 +0000 (UTC) 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 Cc: Ben Dooks --- drivers/video/sm501fb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 56ef6b3..53bc35e 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c @@ -582,7 +582,7 @@ static int sm501fb_pan_crt(struct fb_var_screeninfo *var, { struct sm501fb_par *par = info->par; struct sm501fb_info *fbi = par->info; - unsigned int bytes_pixel = var->bits_per_pixel / 8; + unsigned int bytes_pixel = info->var.bits_per_pixel / 8; unsigned long reg; unsigned long xoffs; @@ -614,10 +614,10 @@ static int sm501fb_pan_pnl(struct fb_var_screeninfo *var, struct sm501fb_info *fbi = par->info; unsigned long reg; - reg = var->xoffset | (var->xres_virtual << 16); + reg = var->xoffset | (info->var.xres_virtual << 16); smc501_writel(reg, fbi->regs + SM501_DC_PANEL_FB_WIDTH); - reg = var->yoffset | (var->yres_virtual << 16); + reg = var->yoffset | (info->var.yres_virtual << 16); smc501_writel(reg, fbi->regs + SM501_DC_PANEL_FB_HEIGHT); sm501fb_sync_regs(fbi);