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 8D2C9C33CAF for ; Thu, 16 Jan 2020 18:26:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CD2420684 for ; Thu, 16 Jan 2020 18:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579199186; bh=Uwhu3H/KgmOENkQrg66cChrMMjw4TYatdgwUWm6jwyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FC0IrfdJQ29UjT8iBjFNWJzh89jSUIvf3jssJQeb73aBX6rJgzAEy6wAPUPzELKZq cx+nLo8mO+dsp3mBzXoxin5/+P3g5U2ePtSnAjl5pGpH5TkU9pSTfCgsmy9xndJSf0 2DF4wFJSNF75ssSoYDS+aTIGlsfLRhYb7zKVYu5E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404005AbgAPR0k (ORCPT ); Thu, 16 Jan 2020 12:26:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:35320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392306AbgAPR0a (ORCPT ); Thu, 16 Jan 2020 12:26:30 -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 05E4F246D3; Thu, 16 Jan 2020 17:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195590; bh=Uwhu3H/KgmOENkQrg66cChrMMjw4TYatdgwUWm6jwyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UvxTwc3/qjxvPIV2ooOxIJuOPVKt1Jw4ykR8GtBoHTMHoGh6fBl9ZADz+xiygGx8U uNvOJ8eK/10DYXoW0dmqBxMRy0MqiLp/Jgi1DNF3QXCb5mrQ8y4XL7/Gc/eJcdKnGh gDGuNnJd1KS0dl+xc9ZqvjGZJTqFSuszTbY6Z4CE= 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.14 168/371] media: ov2659: fix unbalanced mutex_lock/unlock Date: Thu, 16 Jan 2020 12:20:40 -0500 Message-Id: <20200116172403.18149-111-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-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 44b0584eb8a6..e7768ed1ff9c 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1136,7 +1136,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