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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 2544FC432C3 for ; Sat, 16 Nov 2019 16:10:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E4276206C0 for ; Sat, 16 Nov 2019 16:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573920625; bh=KwhayJfvVXO1VVoCQrUPX1fidenkw2bHYQcKqslR7Xs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SYCBNCOCSoZbu1GooKG0xfCk2KqsLpFdFFaDlL+wPxiptHF0WSLxBpDRBz9uZ+naO WOhzuSJ9rtZQAOcwYlLaOa1CJd0fbYKP9hLrPkHHXaWcPfDW+9UN0giP+GEkmBpG9G dfg6sctKfsMeENmyONTTnL3CPFgZFBJ9E2SfgiRQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730228AbfKPPs4 (ORCPT ); Sat, 16 Nov 2019 10:48:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:56044 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730171AbfKPPsq (ORCPT ); Sat, 16 Nov 2019 10:48:46 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 29D1A2086A; Sat, 16 Nov 2019 15:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919325; bh=KwhayJfvVXO1VVoCQrUPX1fidenkw2bHYQcKqslR7Xs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OFBjE6HwKxfOHmwp5YLqPBH60Je/gEvsVYe06uE8gP3OorvWKwLHCkcOu+lVQs/uB NqLfcoC0vBHcaLw1yXvyeXKZ60/QBfpAsdmQ4LVXm2tG1PBL3rdzpQEg3wFLh7nH8Q RSTYNtCCLCUv9x5LePdnT1Fyq4j81Q0dRwL6mA70= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sapthagiri Baratam , Charles Keepax , Lee Jones , Sasha Levin , patches@opensource.cirrus.com Subject: [PATCH AUTOSEL 4.14 067/150] mfd: arizona: Correct calling of runtime_put_sync Date: Sat, 16 Nov 2019 10:46:05 -0500 Message-Id: <20191116154729.9573-67-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sapthagiri Baratam [ Upstream commit 6b269a41a4520f7eb639e61a45ebbb9c9267d5e0 ] Don't call runtime_put_sync when clk32k_ref is ARIZONA_32KZ_MCLK2 as there is no corresponding runtime_get_sync call. MCLK1 is not in the AoD power domain so if it is used as 32kHz clock source we need to hold a runtime PM reference to keep the device from going into low power mode. Fixes: cdd8da8cc66b ("mfd: arizona: Add gating of external MCLKn clocks") Signed-off-by: Sapthagiri Baratam Acked-by: Charles Keepax Signed-off-by: Lee Jones Signed-off-by: Sasha Levin --- drivers/mfd/arizona-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index d8e3184bd27ca..ad8a5296c50ba 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c @@ -52,8 +52,10 @@ int arizona_clk32k_enable(struct arizona *arizona) if (ret != 0) goto err_ref; ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]); - if (ret != 0) - goto err_pm; + if (ret != 0) { + pm_runtime_put_sync(arizona->dev); + goto err_ref; + } break; case ARIZONA_32KZ_MCLK2: ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK2]); @@ -67,8 +69,6 @@ int arizona_clk32k_enable(struct arizona *arizona) ARIZONA_CLK_32K_ENA); } -err_pm: - pm_runtime_put_sync(arizona->dev); err_ref: if (ret != 0) arizona->clk32k_ref--; -- 2.20.1