From patchwork Wed Jul 20 10:25:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 990792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6KAPvuq021378 for ; Wed, 20 Jul 2011 10:25:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750936Ab1GTKZ4 (ORCPT ); Wed, 20 Jul 2011 06:25:56 -0400 Received: from perceval.ideasonboard.com ([95.142.166.194]:42397 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751275Ab1GTKZ4 (ORCPT ); Wed, 20 Jul 2011 06:25:56 -0400 Received: from localhost.localdomain (unknown [91.178.170.101]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 2CF56359A4; Wed, 20 Jul 2011 10:25:55 +0000 (UTC) From: Laurent Pinchart To: linux-fbdev@vger.kernel.org Cc: lethal@linux-sh.org Subject: [PATCH] atmel_lcdfb: Fix compilation Date: Wed, 20 Jul 2011 12:25:55 +0200 Message-Id: <1311157555-10618-1-git-send-email-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <20110713082423.GI13701@linux-sh.org> References: <20110713082423.GI13701@linux-sh.org> 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, 20 Jul 2011 10:25:57 +0000 (UTC) A typo in the "atmel_lcdfb: use display information in info not in var for panning" patch broke compilation. Fix it. Signed-off-by: Laurent Pinchart --- drivers/video/atmel_lcdfb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Paul, This patch applies on top of the fbdev/panning-fixes branch in git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x.git You can apply it, squash it with patch "atmel_lcdfb: use display information in info not in var for panning" in that branch, or replace the whole branch with my "[PATCH v3 00/29] Use display information in info not in var for panning" patch series posted to the linux-fbdev list. Do you plan to push the result for v3.1 ? diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 8b5d755..5f1de1f 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -59,7 +59,7 @@ static void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo, pixeloff = (var->xoffset * info->var.bits_per_pixel) & 0x1f; - dma2dcfg = (info-var.xres_virtual - info->var.xres) + dma2dcfg = (info->var.xres_virtual - info->var.xres) * info->var.bits_per_pixel / 8; dma2dcfg |= pixeloff << ATMEL_LCDC_PIXELOFF_OFFSET; lcdc_writel(sinfo, ATMEL_LCDC_DMA2DCFG, dma2dcfg);