From patchwork Fri Apr 12 15:40:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2436431 Return-Path: X-Original-To: patchwork-linux-sh@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 9D01F3FE81 for ; Fri, 12 Apr 2013 15:41:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754742Ab3DLPlT (ORCPT ); Fri, 12 Apr 2013 11:41:19 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:53082 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754603Ab3DLPk5 (ORCPT ); Fri, 12 Apr 2013 11:40:57 -0400 Received: from axis700.grange (dslb-088-076-023-104.pools.arcor-ip.net [88.76.23.104]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0Loq9D-1V32q81frf-00gWU1; Fri, 12 Apr 2013 17:40:44 +0200 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id E622D40BC4; Fri, 12 Apr 2013 17:40:41 +0200 (CEST) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1UQg5h-0004Do-Kp; Fri, 12 Apr 2013 17:40:41 +0200 From: Guennadi Liakhovetski To: linux-media@vger.kernel.org Cc: Sylwester Nawrocki , Laurent Pinchart , Hans Verkuil , linux-sh@vger.kernel.org, Magnus Damm , Sakari Ailus , Prabhakar Lad Subject: [PATCH v9 13/20] soc-camera: don't attach the client to the host during probing Date: Fri, 12 Apr 2013 17:40:33 +0200 Message-Id: <1365781240-16149-14-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1365781240-16149-1-git-send-email-g.liakhovetski@gmx.de> References: <1365781240-16149-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:dKkuRodVrthxCL+Q9/HKW5efap+BG5dBPvY61tyxLZK AZ167fxhYWfNq1IUT81p/1R3sNKPFv6xqzTFLS1jrss5HvhhOY n2zy3Uj6KxLdK0YpaRrSdtihQlmRCiHGAHOe+2lfDPPNRvo/ux yDF/E6R55BUtlX4QQO/YtZP2ck1XMqZdWGU5NgH4jptNns3qNb /RsMIJu7JGdKicob2qX3uxabX6fyXsWJx0gISAaXfMnjCtwAZA CImipuAcwl89Shj4gQdtyhf0CTJAmyKsfKwaknzk+rz2M431d+ ctaUP7ngG/vk9PUtgin8zL7edeJrlhYInWChGuBmMNVpgsHvtH /fGNW0BeXYwqpMgyWCQ3zlVOxfVFvWIzYfJPyy2wjt/4oY9Xcf Vf/aAYBJhmNjw== Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@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 507f539..f693817 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);