From nobody Sat May 10 03:19:30 2025 Delivered-To: importer2@patchew.org Received-SPF: pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; envelope-from=linux-kernel-owner@vger.kernel.org; helo=vger.kernel.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1619518474; cv=none; d=zohomail.com; s=zohoarc; b=WaWASiyAtTiBD+59UFOojMfzbsd/S3/kVR1reOoYddEN1DXJeQEmKILwVbJvOtRoNv88AxxD7646NldlRkc8pRppMUqCLvDyMrqHtpuPNpLwPYpMZ8IOEltKrmTz588nPTggRs5+zzPWOsIHTeFyKf7pri9V/8i25S7i0Izi0Xc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619518474; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QSKtpUAxvTy/bkqw/JfwZ35LoMEOtg/nFZIWGnE34yQ=; b=Z+Rt3DZ7Zd3S2CRDG5nPBwg83riM1QCoKsSyzg89WOoukH8HtMSDOr3fuK91aVu9X5+h1sKltqYN7t1nM/+GVr94Co5E4xfSMyftpMDOHK0RSsn9MsVQAcY8a5ph2H0B4HHXHrJivYCdYgpJzG0ROMjESKux8pr9jMWTJC6X3ho= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mx.zohomail.com with SMTP id 1619518474081904.8021568357733; Tue, 27 Apr 2021 03:14:34 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235588AbhD0KPP (ORCPT ); Tue, 27 Apr 2021 06:15:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:34660 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235364AbhD0KOf (ORCPT ); Tue, 27 Apr 2021 06:14:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id EE9A0613CB; Tue, 27 Apr 2021 10:13:50 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lbKiy-000j4y-HS; Tue, 27 Apr 2021 12:13:48 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619518431; bh=HuTLNsPcfIqbw1UtY6p4jIBErIihq3Y8I/97JFK7QN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mf7eW9dP2TP0sjdkkPONBu0GYBayxwv2UnUXwRAYpWxdDjQ8GIpxeinjnavuWBVQ/ auG+nF0SZiLP04Id86GgOX7nUZZrxrxyf2NC5hMPMq6XLhD2zri/RnqdFA5EjhjpmA qrPNgfsFSAD5okzqBGxa1qTECjE2dIPIE6waXWG4FhP2PSi1eU7rRHFUtrL2scSzwJ L0BLpNQ5dUk52EqAuyQDsbXBBefVZKQkMXdiWqrmluIsBqAfsfpydZu/m6I7KmyXue PYHjcdkKtptN8FN5PlIFaM63U2OkzP4jcekDeiptJar68dcUlC9EWi3RZRQYogo0lE pDqGqHWYm2vPw== From: Mauro Carvalho Chehab Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab , "Gustavo A. R. Silva" , Allen Pais , Chuhong Yuan , Ezequiel Garcia , Hans Verkuil , Helen Koike , Lubomir Rintel , Mauro Carvalho Chehab , Sakari Ailus , Vaibhav Gupta , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v2 08/79] media: marvel-ccic: fix some issues when getting pm_runtime Date: Tue, 27 Apr 2021 12:12:35 +0200 Message-Id: <94d58e3b2323193deaa0f644da8fd0780f513827.1619518193.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: Mauro Carvalho Chehab To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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/medi= a/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 =3D container_of(hw, struct mcam_camera, mclk_hw); int mclk_src; int mclk_div; + int ret; =20 /* * Clock the sensor appropriately. Controller clock should @@ -931,7 +932,9 @@ static int mclk_enable(struct clk_hw *hw) mclk_div =3D 2; } =20 - pm_runtime_get_sync(cam->dev); + ret =3D 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 =3D sensor_call(cam, core, s_power, 1); if (ret) goto out; - pm_runtime_get_sync(cam->dev); + ret =3D pm_runtime_resume_and_get(cam->dev); + if (ret < 0) + goto out; __mcam_cam_reset(cam); mcam_set_config_needed(cam, 1); } --=20 2.30.2