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 43F4DC2D0BF for ; Tue, 10 Dec 2019 22:44:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AA052053B for ; Tue, 10 Dec 2019 22:44:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017852; bh=t3DU3mm49Jf8LSpEhFNe6t1CAZXyRUCKaeeofxN9ENc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=q960qwmWk4xY8NYjHElnDmBhlVuR4k/8poD24wwWJyWzklKibF8h2U0U11+A+70GV 2/rSLyyPVo9oLUJwKtW5aBjg/1gGB2o3YmsrA0fSUrlGXf/2ayyd3Bs5K+LvvcLROa +jDgIhQfnk5nMEZvfkU3gy+NbHMtxwc9DMrVdzBM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730544AbfLJWoL (ORCPT ); Tue, 10 Dec 2019 17:44:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:50666 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727525AbfLJWaw (ORCPT ); Tue, 10 Dec 2019 17:30:52 -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 F388D20836; Tue, 10 Dec 2019 22:30:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576017051; bh=t3DU3mm49Jf8LSpEhFNe6t1CAZXyRUCKaeeofxN9ENc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UD6VvH0PxOYoTTBB+kNz6ylFC/+OZzhmNoXJV9yi/ubFysTYkZQmfeUsio5/5g4yz EB2Sg1DIKVvjMZh5RSulf6R7PWFucK4kGo3LoN0DS+MlDfqKfafs6BsTDZ1/fPBKug 46zQJpLtRaTiiopjW1LzungDrli4fMbCznP5wWMg= 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.9 13/91] media: i2c: ov2659: fix s_stream return value Date: Tue, 10 Dec 2019 17:29:17 -0500 Message-Id: <20191210223035.14270-13-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191210223035.14270-1-sashal@kernel.org> References: <20191210223035.14270-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 3554eea77e04c..49196afd15a8a 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