From patchwork Mon Aug 24 08:28:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 265203 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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,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 D7908C433DF for ; Mon, 24 Aug 2020 08:34:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7B9422BEA for ; Mon, 24 Aug 2020 08:34:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258049; bh=evrX5QJ9QJ1lif9LJ3zyHjUhpH2onfx59pzdGciYxas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=oEgUr952X5g2EXF4qC4EJ6hvr3zgUc7Lx8sr6M555WMbufFyvAn9PNlKwroQdaDp+ NG34avSOCyXmWn73zuopFts2Rh3FOmuHNXSjI1X43Tqhbb3Wne2f2coy0QZyMq2O3D NoBEEs6vrzz6NnuBEBfQixDCa/abNBV1TqqEzr6g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727807AbgHXIeI (ORCPT ); Mon, 24 Aug 2020 04:34:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:42166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727843AbgHXIeE (ORCPT ); Mon, 24 Aug 2020 04:34:04 -0400 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 04398206F0; Mon, 24 Aug 2020 08:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598258044; bh=evrX5QJ9QJ1lif9LJ3zyHjUhpH2onfx59pzdGciYxas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HUBDLhOGkJzUWce8Wmz31njJruZVySb8nH+oOeH9WSpO6k4Y+siaB47MOKrQC3Npb HNZ7s4k7LI09sC1/bQvFGdck9BZAOWVBnhF9Ws/7gdReJqNhFocfIzOlBZe/0mZu8e vDRD4dl6sWppDpeLtzrtD5t60saoK5TpG0T0rKLU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Rajendra Nayak , Stephen Boyd , Viresh Kumar Subject: [PATCH 5.8 024/148] opp: Put opp table in dev_pm_opp_set_rate() if _set_opp_bw() fails Date: Mon, 24 Aug 2020 10:28:42 +0200 Message-Id: <20200824082415.122358606@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200824082413.900489417@linuxfoundation.org> References: <20200824082413.900489417@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stephen Boyd commit d4ec88d205583ac4f9482cf3e89128589bd881d2 upstream. We get the opp_table pointer at the top of the function and so we should put the pointer at the end of the function like all other exit paths from this function do. Cc: v5.8+ # v5.8+ Fixes: b00e667a6d8b ("opp: Remove bandwidth votes when target_freq is zero") Reviewed-by: Rajendra Nayak Signed-off-by: Stephen Boyd [ Viresh: Split the patch into two ] Signed-off-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman --- drivers/opp/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -876,7 +876,7 @@ int dev_pm_opp_set_rate(struct device *d ret = _set_opp_bw(opp_table, NULL, dev, true); if (ret) - return ret; + goto put_opp_table; if (opp_table->regulator_enabled) { regulator_disable(opp_table->regulators[0]);