From patchwork Wed Dec 26 17:35:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1911221 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id AEAFF3FC85 for ; Wed, 26 Dec 2012 17:36:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752493Ab2LZRgB (ORCPT ); Wed, 26 Dec 2012 12:36:01 -0500 Received: from moutng.kundenserver.de ([212.227.126.187]:54994 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752287Ab2LZRgB (ORCPT ); Wed, 26 Dec 2012 12:36:01 -0500 Received: from axis700.grange (dslb-178-001-136-130.pools.arcor-ip.net [178.1.136.130]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0M7Jry-1StSQ53UAA-00wXbl; Wed, 26 Dec 2012 18:35:59 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 2E46B40B99 for ; Wed, 26 Dec 2012 18:35:59 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1Tnuta-0001cJ-OE for linux-media@vger.kernel.org; Wed, 26 Dec 2012 18:35:58 +0100 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Subject: [PATCH 1/6] media: sh_mobile_ceu_camera: fix CSI2 format negotiation Date: Wed, 26 Dec 2012 18:35:53 +0100 Message-Id: <1356543358-6180-2-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1356543358-6180-1-git-send-email-g.liakhovetski@gmx.de> References: <1356543358-6180-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:TTjDpDv3PO2XCzaWImFBHxVbmIdC2VqfuKBXKx9PH5Y byH3oF/oaceH4n/mJbXDIfDa10IQvvHCLD15QyYf8WUNQoMbMe rxAu/C0uwVwhAEWvPj7Kn1kAwZ9aq9XH6rLGpQEhNSJoh86SMK pn1FW309hnuEydyZzzqM3owFdk6/kvfVPoF/91UEhc/VInOouD n7pBCNjaa8DrgtuH75jb8tLxgcTkW0t0rL20jvTo5/iOe9adkN OjK585W74SGZVg3vMmutLCEUwqzxaXeckZEYhxUcK3qi7WZIcv hEALvGrhoU5hMcVuU8fSZYQj9qwZSHpBr3yjn3KD6pCr57qJIH Zryan3hZP92tlfxaQM+q+S0Ppobo2fAI5bCozsfQH6Fu8PFIIp rKU54BvU0mOFw== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org CSI-2 format negotiation has been broken by a changed order of driver probing. Fix this by allowing an early CSI2 discovery during format enumeration. Signed-off-by: Guennadi Liakhovetski --- .../platform/soc_camera/sh_mobile_ceu_camera.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c index cc46b65..cf65e7f 100644 --- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c @@ -1052,7 +1052,7 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int return 0; } - if (!pcdev->csi2_pdev) { + if (!pcdev->pdata || !pcdev->pdata->csi2) { /* Are there any restrictions in the CSI-2 case? */ ret = sh_mobile_ceu_try_bus_param(icd, fmt->bits_per_sample); if (ret < 0)