From patchwork Fri Nov 6 17:29:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 58072 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA6HTwDG030173 for ; Fri, 6 Nov 2009 17:29:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758397AbZKFR3V (ORCPT ); Fri, 6 Nov 2009 12:29:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754959AbZKFR3T (ORCPT ); Fri, 6 Nov 2009 12:29:19 -0500 Received: from smtp-out114.alice.it ([85.37.17.114]:4189 "EHLO smtp-out114.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755186AbZKFR3O (ORCPT ); Fri, 6 Nov 2009 12:29:14 -0500 Received: from FBCMMO02.fbc.local ([192.168.68.196]) by smtp-out114.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Fri, 6 Nov 2009 18:29:18 +0100 Received: from FBCMCL01B03.fbc.local ([192.168.69.84]) by FBCMMO02.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Fri, 6 Nov 2009 18:29:18 +0100 Received: from badebec ([79.3.140.214]) by FBCMCL01B03.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Fri, 6 Nov 2009 18:29:17 +0100 Date: Fri, 6 Nov 2009 18:29:10 +0100 From: Antonio Ospite To: Guennadi Liakhovetski Cc: linux-arm-kernel@lists.infradead.org, Eric Miao , openezx-devel@lists.openezx.org, Bart Visscher , Linux Media Mailing List Subject: Re: [PATCH 1/3 v2] ezx: Add camera support for A780 and A910 EZX phones Message-Id: <20091106182910.a3b48c41.ospite@studenti.unina.it> In-Reply-To: References: <1257367650-15056-1-git-send-email-ospite@studenti.unina.it> <20091105234429.ef855e2d.ospite@studenti.unina.it> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.3; i686-pc-linux-gnu) X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM/Vb; ]yA5\I~93>J<_`<4)A{':UrE Mime-Version: 1.0 X-OriginalArrivalTime: 06 Nov 2009 17:29:17.0231 (UTC) FILETIME=[AABB13F0:01CA5F06] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 6952e96..3101bcb 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c @@ -881,18 +882,8 @@ static void recalculate_fifo_timeout(struct pxa_camera_dev *pcdev, static void pxa_camera_activate(struct pxa_camera_dev *pcdev) { - struct pxacamera_platform_data *pdata = pcdev->pdata; - struct device *dev = pcdev->soc_host.v4l2_dev.dev; u32 cicr4 = 0; - dev_dbg(dev, "Registered platform device at %p data %p\n", - pcdev, pdata); - - if (pdata && pdata->init) { - dev_dbg(dev, "%s: Init gpios\n", __func__); - pdata->init(dev); - } - /* disable all interrupts */ __raw_writel(0x3ff, pcdev->base + CICR0); @@ -1651,6 +1644,17 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev) pcdev->res = res; pcdev->pdata = pdev->dev.platform_data; + + dev_dbg(&pdev->dev, "Registered platform device at %p data %p\n", + pcdev, pcdev->pdata); + + if (pcdev->pdata && pcdev->pdata->init) { + dev_dbg(&pdev->dev, "%s: Init gpios\n", __func__); + err = pcdev->pdata->init(&pdev->dev); + if (err) + goto exit_clk; + } + pcdev->platform_flags = pcdev->pdata->flags; if (!(pcdev->platform_flags & (PXA_CAMERA_DATAWIDTH_8 | PXA_CAMERA_DATAWIDTH_9 | PXA_CAMERA_DATAWIDTH_10))) {