Message ID | ffe331db9c54f86c80131a436cecd63578c07d9b.1619519080.git.mchehab+huawei@kernel.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <linux-media-owner@kernel.org> 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=-16.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 45A1EC43470 for <linux-media@archiver.kernel.org>; Tue, 27 Apr 2021 10:28:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 13C30613E7 for <linux-media@archiver.kernel.org>; Tue, 27 Apr 2021 10:28:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235517AbhD0K24 (ORCPT <rfc822; linux-media@archiver.kernel.org>); Tue, 27 Apr 2021 06:28:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:48140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235760AbhD0K2L (ORCPT <rfc822;linux-media@vger.kernel.org>); Tue, 27 Apr 2021 06:28:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 85C9861403; Tue, 27 Apr 2021 10:27:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619519236; bh=28FtFakpR3rMJfq6Bb1gqJsNDZKdyp2sz2lduteJODo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qExp0FjGxpnACO9FE+WZ4p4ujgxUWvBJQFjsBQF9PfwZrt8LMRzT4PZo2gfG1jIwu 9CkbNT3pxVOmfhAW5zxySoZ+fU1ZwpQal9JTYMA9uOAe/DOjy5mK0LgN/WoPZAsJ+8 2gNl9EVI7jWEaf0qo0HujPNlmtiEjxO2f72OMtLad359YolUwZ46E+lqvttuAydLg8 np/Sx8jRVYYaMQKYfMY1U8rIMf2b5gqa/XCXa4maHNOHk8pReTs6g5v7KrgAy+pwzp btOkgdI4qD60efWfRJVK28nIebJnbZ8/cRDz/uW8RIC8c1YjWdYgwNmnnLr8Asa1Rd Ag2NR7tEeNGBw== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from <mchehab@kernel.org>) id 1lbKvw-000o0o-OL; Tue, 27 Apr 2021 12:27:12 +0200 From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Mauro Carvalho Chehab <mchehab+huawei@kernel.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, Shawn Tu <shawnx.tu@intel.com>, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Subject: [PATCH v3 33/79] media: i2c: hi556: use pm_runtime_resume_and_get() Date: Tue, 27 Apr 2021 12:26:23 +0200 Message-Id: <ffe331db9c54f86c80131a436cecd63578c07d9b.1619519080.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <cover.1619519080.git.mchehab+huawei@kernel.org> References: <cover.1619519080.git.mchehab+huawei@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab <mchehab@kernel.org> To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/drivers/media/i2c/hi556.c b/drivers/media/i2c/hi556.c index 6f05c1138e3b..627ccfa34835 100644 --- a/drivers/media/i2c/hi556.c +++ b/drivers/media/i2c/hi556.c @@ -813,9 +813,8 @@ static int hi556_set_stream(struct v4l2_subdev *sd, int enable) mutex_lock(&hi556->mutex); if (enable) { - ret = pm_runtime_get_sync(&client->dev); + ret = pm_runtime_resume_and_get(&client->dev); if (ret < 0) { - pm_runtime_put_noidle(&client->dev); mutex_unlock(&hi556->mutex); return ret; }
Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") added pm_runtime_resume_and_get() in order to automatically handle dev->power.usage_count decrement on errors. Use the new API, in order to cleanup the error check logic. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/media/i2c/hi556.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)