From patchwork Tue Jun 11 08:23:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2700931 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 62F0CDF23A for ; Tue, 11 Jun 2013 09:27:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753855Ab3FKJ14 (ORCPT ); Tue, 11 Jun 2013 05:27:56 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:54951 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752042Ab3FKJ1z (ORCPT ); Tue, 11 Jun 2013 05:27:55 -0400 Received: from axis700.grange (dslb-178-001-148-081.pools.arcor-ip.net [178.1.148.81]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0LiJAx-1TzVhI1cTT-00nCOg; Tue, 11 Jun 2013 11:27:16 +0200 Received: from 6a.grange (unknown [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 2529F40BC8; Tue, 11 Jun 2013 10:24:05 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UmJs4-0002Bg-Nb; Tue, 11 Jun 2013 10:24:04 +0200 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: Laurent Pinchart , Sylwester Nawrocki , Hans Verkuil , linux-sh@vger.kernel.org, Magnus Damm , Sakari Ailus , Prabhakar Lad , Sascha Hauer , Guennadi Liakhovetski Subject: [PATCH v10 11/21] soc-camera: don't attach the client to the host during probing Date: Tue, 11 Jun 2013 10:23:38 +0200 Message-Id: <1370939028-8352-12-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1370939028-8352-1-git-send-email-g.liakhovetski@gmx.de> References: <1370939028-8352-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:9nbSGbh06gW/R1d/VjgFO//YQ3jdXvJHnBkpDgT5UpK LEVfILHbpxam0m4dCuF+G586L7lpiq0dC6Vx3YSnKiW9AXDhuz jK1t7u8aW0pxHA177OMqiad2gwCu2Fdcy1fJpErVZ4yUTg4Mjz +zn1AGfsPgZbVxQyD2lMzlL3rCvmkqJvfGeDvuOIMejuOrYpYb QqD6EGEWCiCh9Lhn7+t1cTd/yEVVqKmak7mR2diMlHY4PnV0Nz 2wKFexd3RBWolYB6LwoKd9LisWiFI/1VFSWJ3g6nr2b6+9mK96 V+5+aP451jnY7s+Y1KbDJou0iFhXFCcFEPVRCRoWZQsLG02EJK wDZdnDn8oBJR5+exUhS22z05lwFo0a03bBqi7V5gfRxyetVEyf pcmi6s3GiXKxQ== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org During client probing we only have to turn on the host's clock, no need to actually attach the client to the host. Signed-off-by: Guennadi Liakhovetski --- drivers/media/platform/soc_camera/soc_camera.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c index e503f03..ac98bcb 100644 --- a/drivers/media/platform/soc_camera/soc_camera.c +++ b/drivers/media/platform/soc_camera/soc_camera.c @@ -1207,7 +1207,7 @@ static int soc_camera_probe(struct soc_camera_device *icd) ssdd->reset(icd->pdev); mutex_lock(&ici->host_lock); - ret = soc_camera_add_device(icd); + ret = ici->ops->clock_start(ici); mutex_unlock(&ici->host_lock); if (ret < 0) goto eadd; @@ -1280,7 +1280,7 @@ static int soc_camera_probe(struct soc_camera_device *icd) icd->field = mf.field; } - soc_camera_remove_device(icd); + ici->ops->clock_stop(ici); mutex_unlock(&ici->host_lock); @@ -1303,7 +1303,7 @@ eadddev: icd->vdev = NULL; evdc: mutex_lock(&ici->host_lock); - soc_camera_remove_device(icd); + ici->ops->clock_stop(ici); mutex_unlock(&ici->host_lock); eadd: v4l2_ctrl_handler_free(&icd->ctrl_handler);