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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 4C008C432C0 for ; Wed, 27 Nov 2019 20:41:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 21331215A5 for ; Wed, 27 Nov 2019 20:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887305; bh=6MsO48qqDlueLw2rlZAnHoxYP3IEV8AjklsM9jZxRY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=irkt1Avg9tVInsPp4VUJpYuh78tpWadDfnEBrggDlZ9klqNqf5eYZOJ63++9m7mUR M1Tm9uyseQVSZpdaDywasadOgYiq6qiCwHzqDvBzUXkSybYxxseSCGnULRIfO5cQYr cXsc3sM9UFQLrC03+YDBHjlvYFUhmeXgwSVt5oOo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729233AbfK0Ulo (ORCPT ); Wed, 27 Nov 2019 15:41:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:47190 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727696AbfK0Uln (ORCPT ); Wed, 27 Nov 2019 15:41:43 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6EB5720863; Wed, 27 Nov 2019 20:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887302; bh=6MsO48qqDlueLw2rlZAnHoxYP3IEV8AjklsM9jZxRY0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S4OJSEwvYfB/LDp83CxaMykFQC8QeCvNzXfAhvQrfpZiAF393AYPRlvC43Kpog0R7 dFZdIu29oBn+BiU62wCTCFfQAMVAIc7utd5mAIz8y7jOovgHaDLGN3H9idBsmtArh6 fwz+z/hoHmQhXo0OdYXH+r+ewpMwvUPK2sr5K8EA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sapthagiri Baratam , Charles Keepax , Lee Jones , Sasha Levin Subject: [PATCH 4.9 057/151] mfd: arizona: Correct calling of runtime_put_sync Date: Wed, 27 Nov 2019 21:30:40 +0100 Message-Id: <20191127203032.480021499@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203000.773542911@linuxfoundation.org> References: <20191127203000.773542911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 0556a9749dbe0..1f0c2b594654e 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