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=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,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 94155C04AB6 for ; Mon, 3 Jun 2019 09:18:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D55027FB5 for ; Mon, 3 Jun 2019 09:18:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559553531; bh=62cHW9ljGDz6a4UZEYjVc57iTfhsPUddJlWChrTneBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iKvCfwuV3+hfPnTjOpUVA+wgaDJCU4rqbQBfyy9ciIn6IiZJq8KDLsKJCKd8T43qR ZbUDVKJ8O3Kad3NIikElxc6+6czlZj4MSCq8+GaM1Wnz59Sz79uI2g2vGEyBwRYAjC cVddbpnkvSYWFaCcbXhRapiHlu0RTRNxRm2QA3MI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728009AbfFCJKF (ORCPT ); Mon, 3 Jun 2019 05:10:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:54246 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728022AbfFCJKF (ORCPT ); Mon, 3 Jun 2019 05:10:05 -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 6C7BD27E2A; Mon, 3 Jun 2019 09:10:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559553004; bh=62cHW9ljGDz6a4UZEYjVc57iTfhsPUddJlWChrTneBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aUd/3DxulsEFhY4C8LriWJsSyTQHqhdXAD10tXLsyRX/qH+IRmczInbWs3qBOwUNy 6xSBiHoc6JrW16afbEwhLWERhIdI7mBq4nKveMbD2woFTVotwSzUeZL4mJLHKcbdgn ZMAdLqxFB2XCboXL8nSvuIoZEKNGlxKUceJgkBa8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Baruch Siach , Fugang Duan , "David S. Miller" Subject: [PATCH 4.19 10/32] net: fec: fix the clk mismatch in failed_reset path Date: Mon, 3 Jun 2019 11:08:04 +0200 Message-Id: <20190603090312.154243545@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190603090308.472021390@linuxfoundation.org> References: <20190603090308.472021390@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: Andy Duan [ Upstream commit ce8d24f9a5965a58c588f9342689702a1024433c ] Fix the clk mismatch in the error path "failed_reset" because below error path will disable clk_ahb and clk_ipg directly, it should use pm_runtime_put_noidle() instead of pm_runtime_put() to avoid to call runtime resume callback. Reported-by: Baruch Siach Signed-off-by: Fugang Duan Tested-by: Baruch Siach Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/fec_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3571,7 +3571,7 @@ failed_init: if (fep->reg_phy) regulator_disable(fep->reg_phy); failed_reset: - pm_runtime_put(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); failed_regulator: clk_disable_unprepare(fep->clk_ahb);