From patchwork Tue Jan 25 21:00:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Strakh X-Patchwork-Id: 507001 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 p0PL0nVO012173 for ; Tue, 25 Jan 2011 21:00:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753834Ab1AYVAZ (ORCPT ); Tue, 25 Jan 2011 16:00:25 -0500 Received: from mail-ey0-f174.google.com ([209.85.215.174]:64716 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753379Ab1AYVAY (ORCPT ); Tue, 25 Jan 2011 16:00:24 -0500 Received: by eye27 with SMTP id 27so180017eye.19 for ; Tue, 25 Jan 2011 13:00:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=uDujFqIByAkyh4kIOq1dHN4L36Lr0cTBnSBj/XJnzjs=; b=AwMF+3UTZHpOlzJ51Wb2w6tWUc7TbdP3T3q7h+fFbP8KPqPL6/5kLb1W9i4xbVyxap oqZ0w2khEmED606obBKSAzF3jr//mFqAVKFEVf/IOwVow1KqizrOA3ez7JgNdD9G3rgM rwDjVKpvjJaJnkPJo8m6NgzYAzmeq2vI0fICs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=BelYzVVv9NL0hfNWxMr/4hhNDHK77QL2cHTvGFCfeadoIYzxOyG9M76PopyRy7bTvH 9jJMGOZjnkGbdkZUzTknVkH4qkgC4EGDxYzahVZ+0CSvlcLvdPSzCHz7Xm76w2oM9mPA aInNo7N1TaVEnqgqDWD6ra9VVJB5Z3sQITorY= Received: by 10.14.53.75 with SMTP id f51mr6733408eec.4.1295989223214; Tue, 25 Jan 2011 13:00:23 -0800 (PST) Received: from iceberg (ppp85-140-177-2.pppoe.mtu-net.ru [85.140.177.2]) by mx.google.com with ESMTPS id x54sm11414171eeh.5.2011.01.25.13.00.20 (version=SSLv3 cipher=RC4-MD5); Tue, 25 Jan 2011 13:00:22 -0800 (PST) From: Alexander Strakh To: shijie8@gmail.com Cc: kangyong@telegent.com, xbzhang@telegent.com, mchehab@infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Strakh , Alexander Strakh Subject: [PATCH 1/1] drivers/media/video/tlg2300/pd-video.c: Remove second mutex_unlock in pd_vidioc_s_fmt Date: Wed, 26 Jan 2011 00:00:13 +0300 Message-Id: <1295989213-5171-1-git-send-email-strakh@ispras.ru> X-Mailer: git-send-email 1.7.1 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]); Tue, 25 Jan 2011 21:00:49 +0000 (UTC) diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c index df33a1d..a794ae6 100644 --- a/drivers/media/video/tlg2300/pd-video.c +++ b/drivers/media/video/tlg2300/pd-video.c @@ -764,10 +764,8 @@ static int pd_vidioc_s_fmt(struct poseidon *pd, struct v4l2_pix_format *pix) } ret |= send_set_req(pd, VIDEO_ROSOLU_SEL, vid_resol, &cmd_status); - if (ret || cmd_status) { - mutex_unlock(&pd->lock); + if (ret || cmd_status) return -EBUSY; - } pix_def->pixelformat = pix->pixelformat; /* save it */ pix->height = (context->tvnormid & V4L2_STD_525_60) ? 480 : 576;