From patchwork Mon Jan 4 15:57:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 356399 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp15089575jai; Mon, 4 Jan 2021 08:10:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSFn6s5qeIEbCEjG1j8eaZfAAkJjaPzgo/sg+79T3PJUA9enQaPhY9664FqGJ0ea6TrzCM X-Received: by 2002:a17:906:934c:: with SMTP id p12mr68657200ejw.361.1609776630925; Mon, 04 Jan 2021 08:10:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609776630; cv=none; d=google.com; s=arc-20160816; b=e5HHoCR3wvB4OWXPLRKJ0h1OHPd0FP99/G/ygAhocxsMYV3IxLdvUi1iKoJsvrMCrB /IymOjKNedI4sR+nLylWxDpTo6ODOPDeCMcI64X8wvhg7VNXBDRILII765/aUHQXvmjT 1B+AfU2C9tBUVpeglz1/gIK8pJCvq6e6EccF4BHLAyhnndnl81SNvQ9A38qHjE62cXsA aJwCfm1QlSqacBNXeJSL/cWNfK0icKfumKLwi0FnPpUN1+AniikgyDIucEKA1Mg9dpJO LGMTLmj/YM23GXnF5BS8pUr2d6OjPN78VnJkNl7pmp4kNBaqPChpHcbRLRlrVUgI2oF+ rzIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xL+jRdw6M8gQ1ka+NIReTRyhyS7/hTlNHl0zI0YY5qw=; b=CJOHHEMoL79Bd72GUH7OXQLbks+oXH/H43AvOGOmouktJBcrE5cQqDuNmWa6RbTLEg HNq9waYsL2uUp10GCE2P2G+0fwTFTLPT0vldIKu4AkdPZKFk1ZbH25ljYuZpFwfKYQ/b FEMD2cWKghvuebIRVDlM+yJgAfq5cawpR2+ZoHT9/wjRjH4x/zVP90WvaengWAoyT70H peqVzEHxN1WwCGYO167AEcfdh042hvpl7ignnCP0Ka0l6ZyjgluQWtmAfMKSl84WZoF5 DnYJgc0EikVpKQH2ncWxtuTnrjoVHK6bI9MWxwzI5yQRFAdsmDk0VXnh4k49Tn0aAQyR XvOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1rxRiBOb; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id 61si31780067edk.598.2021.01.04.08.10.30; Mon, 04 Jan 2021 08:10:30 -0800 (PST) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1rxRiBOb; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728309AbhADQJP (ORCPT + 14 others); Mon, 4 Jan 2021 11:09:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:38446 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728603AbhADQBd (ORCPT ); Mon, 4 Jan 2021 11:01:33 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id C80F8224D4; Mon, 4 Jan 2021 16:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609776078; bh=Qsw7kkjV4wurJiVt+Wqj5QaGaotP5tCVGEJj8RzI4A4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1rxRiBObT60iOmrGdiit3ZJQHxzR39S38rYgQmf1bPh5vHWlkd1ORwhP4VMKj8FaB GaZE4fhuWcCKJUV/879Zhy2RVC+AOBAzp8Gkqmyr/lHeV9/QrmBtbocoHKinOOMdgY dGYBnBxsAaElbuRX1p4n37qnjSxOMC4DgcSgGNcE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Viresh Kumar Subject: [PATCH 5.10 12/63] opp: Call the missing clk_put() on error Date: Mon, 4 Jan 2021 16:57:05 +0100 Message-Id: <20210104155709.406778571@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210104155708.800470590@linuxfoundation.org> References: <20210104155708.800470590@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Viresh Kumar commit 0e1d9ca1766f5d95fb881f57b6c4a1ffa63d4648 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- drivers/opp/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -1111,7 +1111,7 @@ static struct opp_table *_allocate_opp_t 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); @@ -1125,6 +1125,9 @@ static struct opp_table *_allocate_opp_t list_add(&opp_table->node, &opp_tables); 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: