From patchwork Mon Dec 28 05:28:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 11990845 X-Patchwork-Delegate: viresh.linux@gmail.com 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 E2592C433E0 for ; Mon, 28 Dec 2020 05:29:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B16D9207C9 for ; Mon, 28 Dec 2020 05:29:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727986AbgL1F3K (ORCPT ); Mon, 28 Dec 2020 00:29:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726417AbgL1F3K (ORCPT ); Mon, 28 Dec 2020 00:29:10 -0500 Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57D94C061794 for ; Sun, 27 Dec 2020 21:28:30 -0800 (PST) Received: by mail-pl1-x62e.google.com with SMTP id be12so5133903plb.4 for ; Sun, 27 Dec 2020 21:28:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3oz21Ub57lWDH8p5jFu652FsrPXlKogfC2kiSGZUKOQ=; b=SvA4JT7MAFuwp9CQ6cuq8DL+TCJ2DsQxbu+hdbTjLKxrSMynLkEHR6xUklwa7YoW5Q XwlsrF57LtmrOpYlahHLPGBEsXjBK0aSiWmJcldWFEm1N/M+uk+lKlM3eCAyTt+EUxYW 4pA+ydtxyXGKgkgXa0TQS7xznu34l0U88QhCKJuEcDdY7ry2XuK1fXd2RNCjVhCn5E3Q Owy+126qF3oWD+fjp/kdBZswVKmSX7+/j9X1auJcwHaBU8Km/0UT8q40ey4CA5Q3GQaz /jmAJsFk98TpUypvhSF1K7FHHJQvjPd3RVPoofl+uYnJAQVPWAWzesxpB4BocKXRBvFv 0Obw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3oz21Ub57lWDH8p5jFu652FsrPXlKogfC2kiSGZUKOQ=; b=GLRm3kOdcdDVut4vniBLnafPQhN1irxyedPs+ycwBiupDXxCWfmDyeY6Uflhr487P9 lXYC2WVzt0HjRK06IqED8Z08XQFfY0tG15JpGVH4uAAzBrEN7oGIJoena/6GhrXyaIVK /A4dpN+uehEVxtXrV4csNzLz0j9aSlWcz89Ay/dUFlHrtJqjnuCzw5/qZ8r39NYhinmv vXbw2gJoeWnLr9FoFM3vK7SZadlDLbOiwmsTfIVWmE+Tc5ufdpTdxAg1vOWaA+oEnHfE iRjwqglLFBP3VGKClkZRebCHa5yvBHEg2Um9I7ES+4m9Sy5nbo4pg5alVwTlRpYasml3 /sLQ== X-Gm-Message-State: AOAM53287FFth/BVrYbgxMFDKWa4yaizaaNBaP2XSy0SsG9jD3kekBO1 FPGIYQLcgWB2RAIQhd6PbPNM7g== X-Google-Smtp-Source: ABdhPJy1JAI4TTJp55VsTyJnfdEhOTvktuLnYwC+MftyBcUZ8fYv8WVgIZhvCLKRLgnCeTOcgkilGw== X-Received: by 2002:a17:90a:e005:: with SMTP id u5mr19325143pjy.64.1609133309944; Sun, 27 Dec 2020 21:28:29 -0800 (PST) Received: from localhost ([122.172.20.109]) by smtp.gmail.com with ESMTPSA id p3sm12399613pjg.53.2020.12.27.21.28.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Dec 2020 21:28:29 -0800 (PST) From: Viresh Kumar To: Viresh Kumar , Nishanth Menon , Stephen Boyd , Krzysztof Kozlowski , Ulf Hansson , Stephan Gerhold Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Rafael Wysocki , quanyang.wang@windriver.com, "v5 . 10" , linux-kernel@vger.kernel.org Subject: [PATCH] opp: Call the missing clk_put() on error Date: Mon, 28 Dec 2020 10:58:21 +0530 Message-Id: <0e1d9ca1766f5d95fb881f57b6c4a1ffa63d4648.1609133256.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.25.0.rc1.19.g042ed3e048af In-Reply-To: <20201224104927.722763-1-quanyang.wang@windriver.com> References: <20201224104927.722763-1-quanyang.wang@windriver.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Fix the clock reference counting by calling the missing clk_put() in the error path. Cc: v5.10 # v5.10 Fixes: dd461cd9183f ("opp: Allow dev_pm_opp_get_opp_table() to return -EPROBE_DEFER") Signed-off-by: Viresh Kumar --- drivers/opp/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index c9e50836b4c2..8c905aabacc0 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1101,7 +1101,7 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index) ret = dev_pm_opp_of_find_icc_paths(dev, opp_table); if (ret) { if (ret == -EPROBE_DEFER) - goto remove_opp_dev; + goto put_clk; dev_warn(dev, "%s: Error finding interconnect paths: %d\n", __func__, ret); @@ -1113,6 +1113,9 @@ static struct opp_table *_allocate_opp_table(struct device *dev, int index) return opp_table; +put_clk: + if (!IS_ERR(opp_table->clk)) + clk_put(opp_table->clk); remove_opp_dev: _remove_opp_dev(opp_dev, opp_table); err: