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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 60D3AC433DF for ; Sun, 23 Aug 2020 12:24:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 357C22075B for ; Sun, 23 Aug 2020 12:24:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598185442; bh=J/P6Vs/QX6pGbqYOELGPtYWRE52WVLAYstbu5eJLztU=; h=Subject:To:Cc:From:Date:List-ID:From; b=RhejiS3tFlp/cQwoOBaoKVNOT9RDJN1dKLhGIFNH6tzgM1TBr3FW1Wux0PLyYVCDh kYojVzQDUwWBgrzY9u0NKP2OGVzJdzzz8gJdYYbRFFV2HJ3Zfg9CAjBJ5RhGPZnA9s YtTa1b+S23QIOFXCjSIzs+vXfYflDE4Nlob5NlEg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727787AbgHWMYB (ORCPT ); Sun, 23 Aug 2020 08:24:01 -0400 Received: from forward3-smtp.messagingengine.com ([66.111.4.237]:55463 "EHLO forward3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727786AbgHWMYA (ORCPT ); Sun, 23 Aug 2020 08:24:00 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailforward.nyi.internal (Postfix) with ESMTP id A571B1940429; Sun, 23 Aug 2020 08:23:59 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Sun, 23 Aug 2020 08:23:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm3; bh=7MADrH lpbG7kbNQfcvwcoswdKrFtjXjKld1ucquLU8s=; b=uPUWbDO9BHYlynACCBPleM EICXAIqqJE6+cW5kkT5uH5Mai7IdtQzT7tvjKpwUn7hdBbJwTCNCjACw5UXLyE0X d6ioaMcwjcE/3jdXdqnlQhxBnz+8VgBhzIniJ25GvIPMc7lXxF0CNHWfx6LbDV7V N3VxJ02ZcWZP5NwYXcVOhIGj3ne+46Rn19oXHfTgVcxH9sdZ//d6ahliwlXocL9U qG4Ww4d60UINqeBYn50jAiccpDEpibR6K9gfe8V6R/eIK9ghFNquRc6DKQljq4RM 1YsrZJYdbLuwFfpcbuVua4WKSkIfAQA7urtv7cQG40l8adsDytEF7oYWKbyFqT9g == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudduiedgheduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuggftrfgrthhtvghrnhepieetveehuedvhfdtgfdvieeiheehfeelveevheejud etveeuveeludejjefgteehnecukfhppeekfedrkeeirdekledruddtjeenucevlhhushht vghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhh drtghomh X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id 021B53280059; Sun, 23 Aug 2020 08:23:58 -0400 (EDT) Subject: FAILED: patch "[PATCH] opp: Put opp table in dev_pm_opp_set_rate() for empty tables" failed to apply to 5.7-stable tree To: swboyd@chromium.org, rnayak@codeaurora.org, stable@vger.kernel.org, viresh.kumar@linaro.org Cc: From: Date: Sun, 23 Aug 2020 14:24:19 +0200 Message-ID: <15981854598296@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 5.7-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 8979ef70850eb469e1094279259d1ef393ffe85f Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Tue, 11 Aug 2020 14:28:36 -0700 Subject: [PATCH] opp: Put opp table in dev_pm_opp_set_rate() for empty tables 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.7+ # v5.7+ Fixes: aca48b61f963 ("opp: Manage empty OPP tables with clk handle") Reviewed-by: Rajendra Nayak Signed-off-by: Stephen Boyd [ Viresh: Split the patch into two ] Signed-off-by: Viresh Kumar diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 9d7fb45b1786..f2f32786ee45 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -893,8 +893,10 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) * have OPP table for the device, while others don't and * opp_set_rate() just needs to behave like clk_set_rate(). */ - if (!_get_opp_count(opp_table)) - return 0; + if (!_get_opp_count(opp_table)) { + ret = 0; + goto put_opp_table; + } if (!opp_table->required_opp_tables && !opp_table->regulators && !opp_table->paths) {