Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp330612ybi; Fri, 7 Jun 2019 08:44:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqz7R6Op74uIePDa8r+JjByK1bu1d1Jh16MM1USkR5SX68AwC20xhzSAnFfGXvOHxtlXCKjE X-Received: by 2002:a17:90a:de14:: with SMTP id m20mr6095918pjv.36.1559922294939; Fri, 07 Jun 2019 08:44:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559922294; cv=none; d=google.com; s=arc-20160816; b=yd6pJ+rQlSA2Jm/5aPHTKqVEujLI1OtJKAusZR5rt+MonhZV6Ru094+75iSyrBYVSs 0TMB3SfLQaEE68lSCs+KzRfIE4/i5jZ/3m6uymMIRWIMSrs+F8bQPdf1Mm0Uxe8ESKv/ YfCuY7Zx2bXqw1rgb7cYoXi9mQ+aH3kER1tFpD69jC5gbc9qnOLUqYGN87JWTSkQdtzd AmFYA9qZ5rJ5gWVl+nit+ZnTZUw6bFW/3UOU5isI3kuGsQOrPDu6IcI7gkV6PQnMuGVq 7g+AyjVa6bUHNjQgsBEnH23PCC/SSbgteM9/zKtegBo2O/VyPGJyxIdtCte2qwoqOk/C YKug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=p5aAKscSdaiNn+ltZW4P4aVUtaZhpF+xkOnak0QeLDE=; b=sWNZZ7UQAl9VGt08Vadnqb0gtIK3JqXLuDZ6/yySHscXD1wA6YoWUgqH3S8DvO6ocO Tmy/Jvb1nEBFRdVu+BhxKIY7GRGS4Tm7vB7gtaJ9p6hP4m0oy08SeYACU+xJF2zRv3Gy 1r0Gzf3uWuP9eKfKEdQbqjh5d76m1jyyjdTFJLGgFGMiFPMk6E7dwpgIr0hxPTdV8hEe ZXaZLRwKwiQmoVvJaBt0clDN8sdx/UTCSLKsjQhhHQ+cplX+4aF2kd+t6aB/FchY9oLl 506D7WU6e/wmyCH/g/eTk3AeZT4Z6OH6Up+MdDBOSDZBuFJYIYV2oS9af53Nlfh+1pOq 7hSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KygqNpgO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e10si2047683pfi.187.2019.06.07.08.44.38; Fri, 07 Jun 2019 08:44:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KygqNpgO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730077AbfFGPkf (ORCPT + 99 others); Fri, 7 Jun 2019 11:40:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:49782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730062AbfFGPkc (ORCPT ); Fri, 7 Jun 2019 11:40:32 -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 4C84C20840; Fri, 7 Jun 2019 15:40:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559922031; bh=yJPBos43c0Oc6npwygAeQLjhZMjaKkYfT8ljzRntpYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KygqNpgORUzOgBoDXRAEUpeYEyu1wnquQizalhvsyu2NXS8R9WCDPB2PZ/vAr6vW9 5R5MA4eKrIeVxDWiIXkdRmPlEDErRH0fOD8mQoRivQgsbbXYR1T8wd6FpMxYXcPM7Q 5m/wKIGPsvd5ID6SOlzLBN6VnUPY2NhcGmKAc/xU= 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.14 04/69] net: fec: fix the clk mismatch in failed_reset path Date: Fri, 7 Jun 2019 17:38:45 +0200 Message-Id: <20190607153848.793186001@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190607153848.271562617@linuxfoundation.org> References: <20190607153848.271562617@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -3539,7 +3539,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);