From patchwork Sat Jul 16 00:13:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 981002 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6G0Dsig000763 for ; Sat, 16 Jul 2011 00:13:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751420Ab1GPANw (ORCPT ); Fri, 15 Jul 2011 20:13:52 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:56539 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750934Ab1GPANw (ORCPT ); Fri, 15 Jul 2011 20:13:52 -0400 Received: from axis700.grange (dslb-178-001-145-049.pools.arcor-ip.net [178.1.145.49]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0MLC0j-1Qi9Ut3V2X-000Mwc; Sat, 16 Jul 2011 02:13:50 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 8BBCF189B6E; Sat, 16 Jul 2011 02:13:50 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 86B15189B6D for ; Sat, 16 Jul 2011 02:13:50 +0200 (CEST) Date: Sat, 16 Jul 2011 02:13:50 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List Subject: [PATCH 3/6] V4L: soc-camera: group struct field initialisations together In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:gs4Uy8fZFhvJyufXAFnVSMN9+sMMucC0peTZMQNB/eL D2Iz4PNiqzRXbNtMb+NPD6jwvHnL3t7v5oQCYmbocaquS0FVwB DwEbDCs9kDBgyjDG7rdkCAD6rUg57aDU6j7N7vf/FNTcDkuqzG d0Vf2YnDZsEUTPSY9dzflzpyPAE0VsLlMgfju44x/AjW3dJ/id iWbxTZ5RN84e7kdBu+ebFcKBKYvwPcEefsVJhkb8jA= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 16 Jul 2011 00:13:54 +0000 (UTC) Signed-off-by: Guennadi Liakhovetski --- drivers/media/video/soc_camera.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 5084e72..96bed29 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -1118,8 +1118,6 @@ static int soc_camera_probe(struct device *dev) icd->field = V4L2_FIELD_ANY; - icd->vdev->lock = &icd->video_lock; - /* * ..._video_start() will create a device node, video_register_device() * itself is protected against concurrent open() calls, but we also have @@ -1468,6 +1466,7 @@ static int video_dev_create(struct soc_camera_device *icd) vdev->ioctl_ops = &soc_camera_ioctl_ops; vdev->release = video_device_release; vdev->tvnorms = V4L2_STD_UNKNOWN; + vdev->lock = &icd->video_lock; icd->vdev = vdev;