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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,USER_AGENT_SANE_1 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 E3D51C352A2 for ; Fri, 7 Feb 2020 12:57:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC74E20838 for ; Fri, 7 Feb 2020 12:57:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726894AbgBGM5h (ORCPT ); Fri, 7 Feb 2020 07:57:37 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:53054 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726798AbgBGM5h (ORCPT ); Fri, 7 Feb 2020 07:57:37 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: koike) with ESMTPSA id CCE3C29589A Subject: Re: [PATCH 2/4] media: staging: rkisp1: isp: check for dphy bus before initializations in s_stream To: Dafna Hirschfeld , linux-media@vger.kernel.org Cc: ezequiel@collabora.com, hverkuil@xs4all.nl, kernel@collabora.com, dafna3@gmail.com, sakari.ailus@linux.intel.com, linux-rockchip@lists.infradead.org, mchehab@kernel.org References: <20200207085951.5226-1-dafna.hirschfeld@collabora.com> <20200207085951.5226-3-dafna.hirschfeld@collabora.com> From: Helen Koike Message-ID: <9b18a62a-cb7b-f175-8080-d5281e91422e@collabora.com> Date: Fri, 7 Feb 2020 09:57:29 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 In-Reply-To: <20200207085951.5226-3-dafna.hirschfeld@collabora.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 2/7/20 6:59 AM, Dafna Hirschfeld wrote: > In rkisp1_isp_s_stream it is better to return error in case the > bus type is not dphy before initializing the registers. > > Signed-off-by: Dafna Hirschfeld Acked-by: Helen Koike Thanks Helen > --- > drivers/staging/media/rkisp1/rkisp1-isp.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c > index 56bd95d01f65..c98e3c16f520 100644 > --- a/drivers/staging/media/rkisp1/rkisp1-isp.c > +++ b/drivers/staging/media/rkisp1/rkisp1-isp.c > @@ -963,14 +963,14 @@ static int rkisp1_isp_s_stream(struct v4l2_subdev *sd, int enable) > rkisp1->active_sensor = container_of(sensor_sd->asd, > struct rkisp1_sensor_async, asd); > > + if (rkisp1->active_sensor->mbus.type != V4L2_MBUS_CSI2_DPHY) > + return -EINVAL; > + > atomic_set(&rkisp1->isp.frame_sequence, -1); > ret = rkisp1_config_cif(rkisp1); > if (ret) > return ret; > > - if (rkisp1->active_sensor->mbus.type != V4L2_MBUS_CSI2_DPHY) > - return -EINVAL; > - > ret = rkisp1_mipi_csi2_start(&rkisp1->isp, rkisp1->active_sensor); > if (ret) > return ret; >