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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 8B630C433EF for ; Thu, 9 Sep 2021 12:49:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68D8061100 for ; Thu, 9 Sep 2021 12:49:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1355200AbhIIMuh (ORCPT ); Thu, 9 Sep 2021 08:50:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:60534 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353596AbhIIMrE (ORCPT ); Thu, 9 Sep 2021 08:47:04 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7D99363214; Thu, 9 Sep 2021 11:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631188573; bh=0wzEjVX7fdd5+99qUUeHAxUAR+j6i0qFrKM9/R1zZVk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o06PDsGpOYK+Fl769cpsdQzciqmq1BkoIbY0FsZrgm5vF45SsNpnWQKh/s4OUVqLZ +TVcPK/HAvRl8aYOWf6qnGqfD1w07sEK+tXQHwcDPVaeEecowdKa93JgDE5EadRNZ4 +mw2cmlmiuLbWpdAxDjOPeu29HXH/bp+3Lv+Vdvb+O0MIGT3uTPTgxj56x4bsrPXML jfgjCA3fYtCZlxddufv6qJWYdMFAX5/x/wq4Zk2IRbwTb0ULqCEFUWIBRTXcn+dQRJ s+7+PdrW/Y2yWcAu9mpJP67p0nHfV8frdOLFIYJcGjl7N7hXNGRf6vcjX2wqiyLWHV 587MDBATun/lA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 052/109] media: TDA1997x: fix tda1997x_query_dv_timings() return value Date: Thu, 9 Sep 2021 07:54:09 -0400 Message-Id: <20210909115507.147917-52-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210909115507.147917-1-sashal@kernel.org> References: <20210909115507.147917-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Krzysztof Hałasa [ Upstream commit 7dee1030871a48d4f3c5a74227a4b4188463479a ] Correctly propagate the tda1997x_detect_std error value. Signed-off-by: Krzysztof Hałasa Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/tda1997x.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c index e43d8327b810..fc6cea5f3d3b 100644 --- a/drivers/media/i2c/tda1997x.c +++ b/drivers/media/i2c/tda1997x.c @@ -1695,14 +1695,15 @@ static int tda1997x_query_dv_timings(struct v4l2_subdev *sd, struct v4l2_dv_timings *timings) { struct tda1997x_state *state = to_state(sd); + int ret; v4l_dbg(1, debug, state->client, "%s\n", __func__); memset(timings, 0, sizeof(struct v4l2_dv_timings)); mutex_lock(&state->lock); - tda1997x_detect_std(state, timings); + ret = tda1997x_detect_std(state, timings); mutex_unlock(&state->lock); - return 0; + return ret; } static const struct v4l2_subdev_video_ops tda1997x_video_ops = { -- 2.30.2