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=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 7C51BC00454 for ; Tue, 10 Dec 2019 22:38:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 402F52053B for ; Tue, 10 Dec 2019 22:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017535; bh=0qL3SwA6m1eRx1gaflIScIFZmaIyxiPgB20tGMqjR00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=B5j3pP7FLEgZgx++Xl/uPHiqTo5Ag6WlqnjHojAsgmT4q3OZNrsbNtHSc27KuZ/kJ l10fzV0MLYM0AWd+QjasngLKP/865OP6p1P/F1pWuxUiKber8UjJpOneDTepizDwXm kdZYMYaG687sAsIi3CQneHQFs/MQKZnLe7wZdJ/E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729837AbfLJWde (ORCPT ); Tue, 10 Dec 2019 17:33:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:54310 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728660AbfLJWd2 (ORCPT ); Tue, 10 Dec 2019 17:33:28 -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 0DA1121556; Tue, 10 Dec 2019 22:33:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017207; bh=0qL3SwA6m1eRx1gaflIScIFZmaIyxiPgB20tGMqjR00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=shSi3d8L0ZrrYp3rXflC6ffP+WIJR68w/0zkusoxDotJnICpKKnJPmqAlcWM45Kwm uUXkRTu4QDMlBPYFm/p4uBcJgOMIzD6/nGEVx9mGOxh0SBOYTMAW6RfsofUL8qpEZp Wt+IR3l78HGRwczZQZoEAGdVVKpEKVa4kQHBNj9M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benoit Parrot , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 09/71] media: i2c: ov2659: fix s_stream return value Date: Tue, 10 Dec 2019 17:32:14 -0500 Message-Id: <20191210223316.14988-9-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210223316.14988-1-sashal@kernel.org> References: <20191210223316.14988-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: Benoit Parrot [ Upstream commit 85c4043f1d403c222d481dfc91846227d66663fb ] In ov2659_s_stream() return value for invoked function should be checked and propagated. Signed-off-by: Benoit Parrot Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ov2659.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c index fadec1d705829..4f43e8c43950e 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1204,11 +1204,15 @@ static int ov2659_s_stream(struct v4l2_subdev *sd, int on) goto unlock; } - ov2659_set_pixel_clock(ov2659); - ov2659_set_frame_size(ov2659); - ov2659_set_format(ov2659); - ov2659_set_streaming(ov2659, 1); - ov2659->streaming = on; + ret = ov2659_set_pixel_clock(ov2659); + if (!ret) + ret = ov2659_set_frame_size(ov2659); + if (!ret) + ret = ov2659_set_format(ov2659); + if (!ret) { + ov2659_set_streaming(ov2659, 1); + ov2659->streaming = on; + } unlock: mutex_unlock(&ov2659->lock); -- 2.20.1