From patchwork Mon Mar 14 13:38:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 6082 Return-path: Envelope-to: mchehab@pedra Delivery-date: Mon, 14 Mar 2011 10:38:58 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1Pz7z7-0003ko-QV for mchehab@pedra; Mon, 14 Mar 2011 10:38:58 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Mon, 14 Mar 2011 10:38:57 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1Pz7yy-0006RD-EM; Mon, 14 Mar 2011 13:38:48 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752354Ab1CNNih (ORCPT + 1 other); Mon, 14 Mar 2011 09:38:37 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:48852 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092Ab1CNNih (ORCPT ); Mon, 14 Mar 2011 09:38:37 -0400 Received: by gwaa18 with SMTP id a18so1814447gwa.19 for ; Mon, 14 Mar 2011 06:38:36 -0700 (PDT) Received: by 10.151.3.2 with SMTP id f2mr5913737ybi.47.1300109916063; Mon, 14 Mar 2011 06:38:36 -0700 (PDT) Received: from localhost.localdomain (c-24-4-33-58.hsd1.ca.comcast.net [24.4.33.58]) by mx.google.com with ESMTPS id q13sm1971687yba.20.2011.03.14.06.38.33 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Mar 2011 06:38:34 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: m.szyprowski@samsung.com, g.liakhovetski@gmx.de, hverkuil@xs4all.nl, Pawel Osciak Subject: [PATCH 1/2] [media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly Date: Mon, 14 Mar 2011 06:38:23 -0700 Message-Id: <1300109904-3991-1-git-send-email-pawel@osciak.com> X-Mailer: git-send-email 1.7.4.1 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Use vb2_dma_contig_plane_paddr to retrieve a physical address for a plane instead of calling an internal mem_ops callback. Signed-off-by: Pawel Osciak --- drivers/media/video/sh_mobile_ceu_camera.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 61f3701..3fe54bf 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c @@ -302,9 +302,7 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev) bottom2 = CDBCR; } - /* mem_ops->cookie must not be NULL */ - phys_addr_top = (dma_addr_t)icd->vb2_vidq.mem_ops->cookie(pcdev-> - active->planes[0].mem_priv); + phys_addr_top = vb2_dma_contig_plane_paddr(pcdev->active, 0); ceu_write(pcdev, top1, phys_addr_top); if (V4L2_FIELD_NONE != pcdev->field) {