From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15D6DC33CAF for ; Thu, 16 Jan 2020 18:09:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DAAFC2073A for ; Thu, 16 Jan 2020 18:09:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579198146; bh=IJMGW8gLWsyyTQNqcA+b0r72ujTF6o/zNtEEivEBwGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z/GmqJoeKj0EeO+/W90mDVHDreT/Td+HqIqpngSaZJq7AZHtMygE1WK+As3KL2t5A lllyMBrHMCqEKl60x5TXPZEvH7a+gcNfANLCbYK7972i+ID8TGuF1ndxzyvtwUu1ci GIHl0BVdh1F2KLg8f/bIy2RAS7ITn2At5qBaviH4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395064AbgAPSJE (ORCPT ); Thu, 16 Jan 2020 13:09:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:54472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405041AbgAPRic (ORCPT ); Thu, 16 Jan 2020 12:38:32 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6A97F246D5; Thu, 16 Jan 2020 17:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196312; bh=IJMGW8gLWsyyTQNqcA+b0r72ujTF6o/zNtEEivEBwGU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AewYDxpR//30uo/k1I63fylpx0T9p2kqsEBLJ1MA2cjusMIhr3BtbS3aLVlkgyYxt nuzSWQpud6f1SXgWoM94C2287ItjUFw88LPdbq/KHnnoDNSIV1S2p50kkBwzFeUVDe JY/8qSaY+0nEAQ+KZVdLXkkMYM2Hk7soWIqHQCTQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Akinobu Mita , "Lad Prabhakar" , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 119/251] media: ov2659: fix unbalanced mutex_lock/unlock Date: Thu, 16 Jan 2020 12:34:28 -0500 Message-Id: <20200116173641.22137-79-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Akinobu Mita [ Upstream commit 384538bda10913e5c94ec5b5d34bd3075931bcf4 ] Avoid returning with mutex locked. Fixes: fa8cb6444c32 ("[media] ov2659: Don't depend on subdev API") Cc: "Lad Prabhakar" Signed-off-by: Akinobu Mita Acked-by: Lad Prabhakar Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov2659.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c index ade3c48e2e0c..18546f950d79 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1137,7 +1137,7 @@ static int ov2659_set_fmt(struct v4l2_subdev *sd, mf = v4l2_subdev_get_try_format(sd, cfg, fmt->pad); *mf = fmt->format; #else - return -ENOTTY; + ret = -ENOTTY; #endif } else { s64 val; -- 2.20.1