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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 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 AD59DC433B4 for ; Fri, 30 Apr 2021 16:31:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C639613CE for ; Fri, 30 Apr 2021 16:31:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230048AbhD3QcM (ORCPT ); Fri, 30 Apr 2021 12:32:12 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]:2959 "EHLO frasgout.his.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbhD3QcL (ORCPT ); Fri, 30 Apr 2021 12:32:11 -0400 Received: from fraeml738-chm.china.huawei.com (unknown [172.18.147.200]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4FWyK33ZbNz70gG8; Sat, 1 May 2021 00:20:39 +0800 (CST) Received: from lhreml710-chm.china.huawei.com (10.201.108.61) by fraeml738-chm.china.huawei.com (10.206.15.219) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 30 Apr 2021 18:31:21 +0200 Received: from localhost (10.52.124.90) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 30 Apr 2021 17:31:20 +0100 Date: Fri, 30 Apr 2021 17:29:45 +0100 From: Jonathan Cameron To: Mauro Carvalho Chehab CC: , , "Gustavo A. R. Silva" , Allen Pais , Chuhong Yuan , Ezequiel Garcia , "Hans Verkuil" , Helen Koike , Lubomir Rintel , Mauro Carvalho Chehab , Sakari Ailus , "Vaibhav Gupta" , , Subject: Re: [PATCH v4 09/79] media: marvel-ccic: fix some issues when getting pm_runtime Message-ID: <20210430172945.000000fc@Huawei.com> In-Reply-To: References: Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; i686-w64-mingw32) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.52.124.90] X-ClientProxiedBy: lhreml719-chm.china.huawei.com (10.201.108.70) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 28 Apr 2021 16:51:30 +0200 Mauro Carvalho Chehab wrote: > Calling pm_runtime_get_sync() is bad, since even when it > returns an error, pm_runtime_put*() should be called. > So, use instead pm_runtime_resume_and_get(). > > While here, ensure that the error condition will be checked > during clock enable an media open() calls. > > Signed-off-by: Mauro Carvalho Chehab Reviewed-by: Jonathan Cameron > --- > drivers/media/platform/marvell-ccic/mcam-core.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c > index 141bf5d97a04..ea87110d9073 100644 > --- a/drivers/media/platform/marvell-ccic/mcam-core.c > +++ b/drivers/media/platform/marvell-ccic/mcam-core.c > @@ -918,6 +918,7 @@ static int mclk_enable(struct clk_hw *hw) > struct mcam_camera *cam = container_of(hw, struct mcam_camera, mclk_hw); > int mclk_src; > int mclk_div; > + int ret; > > /* > * Clock the sensor appropriately. Controller clock should > @@ -931,7 +932,9 @@ static int mclk_enable(struct clk_hw *hw) > mclk_div = 2; > } > > - pm_runtime_get_sync(cam->dev); > + ret = pm_runtime_resume_and_get(cam->dev); > + if (ret < 0) > + return ret; > clk_enable(cam->clk[0]); > mcam_reg_write(cam, REG_CLKCTRL, (mclk_src << 29) | mclk_div); > mcam_ctlr_power_up(cam); > @@ -1611,7 +1614,9 @@ static int mcam_v4l_open(struct file *filp) > ret = sensor_call(cam, core, s_power, 1); > if (ret) > goto out; > - pm_runtime_get_sync(cam->dev); > + ret = pm_runtime_resume_and_get(cam->dev); > + if (ret < 0) > + goto out; > __mcam_cam_reset(cam); > mcam_set_config_needed(cam, 1); > }