From nobody Sat May 10 06:18:09 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=1619246769; cv=none; d=zohomail.com; s=zohoarc; b=Ze+THkfpVTp2Z+LBDf/3Xh0Ywi3cmxpe6EXYTj5W2zzJJMFOWyYDhQR9iMDRgcWBs2ozmUt2GZuI8mhZ12ewoLDRka6eJaorolskyB2Xz7jvUep1In9FospJKPnIT8cUy5nsE7efV+NaO690g6agu2d1SvjeZeyg51CHv8tyVAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619246769; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zzSHtEFA+m1lZkIIm3W5ENMReNLO4BKIvKzu8FlllJE=; b=ER2SodCo4wcoeAFvpRNVSep6g78fkI4E1GO1RzzLglJGXJx6AU/j7s3ySXLK++eFstItTXP4fhMp57jmadEhF/wGvmclxRYmN3f3mjMtaXQyMUySckijTajdJudEqzPFotGFfzMD71sukbgYyFzU7R5ydoUu1d/GELCC1YnWIVw= 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 1619246769705987.2904900945252; Fri, 23 Apr 2021 23:46:09 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237263AbhDXGqp (ORCPT ); Sat, 24 Apr 2021 02:46:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:35726 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231135AbhDXGqL (ORCPT ); Sat, 24 Apr 2021 02:46:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F00896148E; Sat, 24 Apr 2021 06:45:32 +0000 (UTC) Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1laC2k-004Jdn-Tu; Sat, 24 Apr 2021 08:45:30 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619246733; bh=tBhz+mbkfcRSxvb4EBkBlG70VP44aXYRzSWpLAI0sn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOcopj2YMQ3ovKY0IFy5K4HL+1PEQWwRJ7ACkARgsgui1dMzQUhxFzT55yvJAWrow daAmC6m7VFHF/8EmYxjeXEj4Ohs3I82/JVVINkeKDggE3PWqIaVjmL/wFS5W/ESRhm drZIRGBX7KaDWusc5DsPIhO1vLhyIvSzKLE1ZLRsUuOZTLtQ8qeeTh8rADvhvvoSl7 pAW9lzOQxEr16nSN0EmTo5ztMuvCeMX7bEu5+F86LguqftJ7BQu1DShxmix+YxO/zA 5fG0iqiD53ghie+3zRgo4yTqRZCVssPX2PXRYwpdtlFS9PmDLuhoBX41cnTFr5EGGV nNCWS/kfpRjAw== 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 , Lubomir Rintel , Mauro Carvalho Chehab , Sakari Ailus , Vaibhav Gupta , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH 02/78] media: marvel-ccic: fix some issues when getting pm_runtime Date: Sat, 24 Apr 2021 08:44:12 +0200 Message-Id: <93a8c81827fd7fdd4b50ba5c5f63387519559bf5.1619191723.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..3c3a6592e0e6 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) + return ret; __mcam_cam_reset(cam); mcam_set_config_needed(cam, 1); } --=20 2.30.2