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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 EBD30C2D0DB for ; Fri, 24 Jan 2020 11:38:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B66E0214DB for ; Fri, 24 Jan 2020 11:38:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865922; bh=lZ633VuZ/Ggg4cq6Gfgu319/Hb3tcvfC/zXXUcuXIVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ag0rEtIpFajuvk5D2Hu0zCZeQVEK6S7EzGmx+/eBAxoK4ygNb8JUdhb/X8tbouW4l 9D3d2NfnhuIUKYZ+6D5vHPlQHg/ggoa7AxZgwTf3wDhkG/UAoxI+I0I/dRObwMVrWm aPGWB83Z3bwIr3hitrjCtjIVufKURIqx6eoAuFX4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391981AbgAXLil (ORCPT ); Fri, 24 Jan 2020 06:38:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:58536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388814AbgAXLii (ORCPT ); Fri, 24 Jan 2020 06:38:38 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6B1702075D; Fri, 24 Jan 2020 11:38:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865918; bh=lZ633VuZ/Ggg4cq6Gfgu319/Hb3tcvfC/zXXUcuXIVU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tnnidC9TTHFF4Ao22fWCyJIT5G1QkXDo1cjYyjSUnArWqfm7aFBUdDMT6WukrfcbJ OEz2ElC609ZVrqGmEyShs95AGVrxqHKBJ1DCKDNA5hbLGBWoBFgWL2bttXC3OdhhSM eLhAJPWUgBwhLd4T7wEuIRpoNd3u+UWaEgN0+Cz0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Lad, Prabhakar" , Akinobu Mita , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 174/343] media: ov2659: fix unbalanced mutex_lock/unlock Date: Fri, 24 Jan 2020 10:29:52 +0100 Message-Id: <20200124092942.891957189@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 44b0584eb8a6c..e7768ed1ff9c2 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