From patchwork Sat Dec 25 21:29:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 432941 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBPLTxcK031393 for ; Sat, 25 Dec 2010 21:30:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752000Ab0LYV35 (ORCPT ); Sat, 25 Dec 2010 16:29:57 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:54408 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751660Ab0LYV35 (ORCPT ); Sat, 25 Dec 2010 16:29:57 -0500 Received: from axis700.grange (pD9EB9458.dip0.t-ipconnect.de [217.235.148.88]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MT3nG-1PvFos48Yg-00STLK; Sat, 25 Dec 2010 22:29:53 +0100 Received: by axis700.grange (Postfix, from userid 1000) id AD5B6E6A7C; Sat, 25 Dec 2010 22:29:52 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id A4A401067DC; Sat, 25 Dec 2010 22:29:52 +0100 (CET) Date: Sat, 25 Dec 2010 22:29:52 +0100 (CET) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Mauro Carvalho Chehab Subject: [PATCH] v4l: soc-camera: fix multiple simultaneous user case Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:dQxVrjnml6sVfjOnOxAAjqi0rY8LfuaK06MAb3w3t4t o961x2ofOcJk0rH7TwGVcanMxbVdFscjJJ1xGLxKqC4MDKnVRA xL7Ok45PDEC5DdUKEpc62PYQThQ8XDYWd4x36dXOHK06xHS9SG 2F5GaugRIclRawtO4liejD4oBV5XsJ0mFHbOOkEf817SwytMnO LvVjGZ0NFvodtFmJEpcihvd26plBl/XuFGqpz/u6JE= 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.3 (demeter1.kernel.org [140.211.167.41]); Sat, 25 Dec 2010 21:30:00 +0000 (UTC) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 335120c..052bd6d 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -405,13 +405,13 @@ static int soc_camera_open(struct file *file) ret = soc_camera_set_fmt(icd, &f); if (ret < 0) goto esfmt; + + ici->ops->init_videobuf(&icd->vb_vidq, icd); } file->private_data = icd; dev_dbg(&icd->dev, "camera device open\n"); - ici->ops->init_videobuf(&icd->vb_vidq, icd); - mutex_unlock(&icd->video_lock); return 0;