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 99414C2D0D1 for ; Sun, 29 Dec 2019 18:02:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 69F39206DB for ; Sun, 29 Dec 2019 18:02:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642573; bh=SigJjHNqBFtHN3igdXzURp3lvmTFztSboPXepyHJmrk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=REMY0h570+Wk7DMbjrDYlw3gdP/BiF0jnB3jDQGKUM8OLEceP2GvB0CdL0Ez7xMYH XQmx2DUyURWmz7l/wBIEPS+YVnn7o6HzJa8m02f7Iy55T4tnuGU0kqaKAYNkcbvw7q dXDJ5dEs4F6xmz/PMYdAWJzZKtoVvFDDmiUW3p8I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387720AbfL2SCp (ORCPT ); Sun, 29 Dec 2019 13:02:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:54428 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732515AbfL2SCo (ORCPT ); Sun, 29 Dec 2019 13:02:44 -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 E185C207FF; Sun, 29 Dec 2019 18:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577642563; bh=SigJjHNqBFtHN3igdXzURp3lvmTFztSboPXepyHJmrk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bRbmdZeki0hiSYtA6GMcl5QuM68d3ylCaDZCd/FsUvE8+RE7mLlQfI7wYLlemyznz 4xI8id+C81wFC58/sHwu2Vuj30PWUO3pRHFy5DJVtSnnNftvWfFXCQ9iDVTcjBPbSC fgT4SYQe9Ra0MMe+MFHoipCUuZG3ikLCm8hOGRgo= 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 5.4 081/434] media: i2c: ov2659: fix s_stream return value Date: Sun, 29 Dec 2019 18:22:14 +0100 Message-Id: <20191229172706.952860684@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@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 f4ded0669ff9..70bf63b9dbd0 100644 --- a/drivers/media/i2c/ov2659.c +++ b/drivers/media/i2c/ov2659.c @@ -1201,11 +1201,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