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 3A8CEC2D0D1 for ; Sun, 29 Dec 2019 17:59:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 13A4D222C3 for ; Sun, 29 Dec 2019 17:59:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642360; bh=OSXvnG9qDmFYvrWO2qVzRVyagtp2Fir+0BS8A365/0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TzpRAAjDmMMGWJEoK9X/j/km/hgOscgwoLMJ/pT8UsmPqU1C+9ozPriF1q6u34R3w cdFRnongVenuvFg+yxb35aCSAwcaxmv1EP7O06mC3h6it+6CUR9/eZE1AAaoUEot1o xKhensgRno0GaNrQRYht8R1ANKuOp3O17B7vwXpE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733239AbfL2R7P (ORCPT ); Sun, 29 Dec 2019 12:59:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:50542 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733102AbfL2R7C (ORCPT ); Sun, 29 Dec 2019 12:59:02 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 CA9C5208C4; Sun, 29 Dec 2019 17:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642342; bh=OSXvnG9qDmFYvrWO2qVzRVyagtp2Fir+0BS8A365/0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o1SFXq4KspP0EiMEYgze/m5K7KKBSXCIuRylrPZWGvjHETRkDswpPiI2MHMybMsJI MRN1GYUz871AIxV8olkX6Qxda6MAhkDsqNugYjCbNdK08YwMr9NOcyvfXRWFuasL3h qXu5eSvTNCjKDf114J+x8GGaDYruERUtHlqJuADc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Benoit Parrot , "Lad, Prabhakar" , Sakari Ailus , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 030/161] media: i2c: ov2659: fix s_stream return value Date: Sun, 29 Dec 2019 18:17:58 +0100 Message-Id: <20191229162407.684091116@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162355.500086350@linuxfoundation.org> References: <20191229162355.500086350@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 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 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/media/i2c/ov2659.c b/drivers/media/i2c/ov2659.c index ce23f436e130..04d493aea45e 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1203,11 +1203,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