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 99AE8C35242 for ; Fri, 24 Jan 2020 11:38:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6570D206F0 for ; Fri, 24 Jan 2020 11:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865930; bh=oi+MjKGkj+3amReMtz4+25L60nkOW7AVttiic5YxrXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tJIGIHGaTQD/HwMpdGtwehjGYIW612EeDSromUcknVkT7CqeTaSfuqRRac/D4l2V/ 3bTjDkX3hAuJ1cK2au3qFh+wZ0VaLMVtONdJAW5V7c6l3EVioUTbYgEehOI2ev0jtH pWBujCr+TYdd7QLbVKWtOB54K1FnhB2ZeHyzEOMc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391997AbgAXLit (ORCPT ); Fri, 24 Jan 2020 06:38:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:58696 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391987AbgAXLip (ORCPT ); Fri, 24 Jan 2020 06:38:45 -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 8763920708; Fri, 24 Jan 2020 11:38:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865925; bh=oi+MjKGkj+3amReMtz4+25L60nkOW7AVttiic5YxrXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IB11vlMxIZIToYeudOngQ7CIbk+pDWr+vleRl4YbBbjv3PoLMzclRDAPF5kDFnsTx MzQQr3JDz+h2k5O6+vS8alfazY2en1ryTlXXWFtF5bXWB51vZ4xldNdmJuMVv0l3fD tEG1AuqbA4jZv1HJHmOUCzdPK7X8osnFpoVtI6oI= 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.19 321/639] media: ov2659: fix unbalanced mutex_lock/unlock Date: Fri, 24 Jan 2020 10:28:11 +0100 Message-Id: <20200124093127.242991179@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@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 4b6be3b0fd528..5cdda9d6ca31e 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