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=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,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 60042C10F00 for ; Tue, 12 Mar 2019 17:17:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2A6D7217D8 for ; Tue, 12 Mar 2019 17:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552411042; bh=x3vu7x/fkh54RFxNPxJpqc3uUW6I4b+4T1PyFT+ZLcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Hmt9GmQvYyjpAs7IBcibZDWD2ikeKy8Jompw688pbvOUvm/0EfErYGB5WdHc8fGec JhFLCN+whZKeP8bzySmiskgY2gQknpmu4Jj1SPUUD8vObwSLM8n3ewdyc7xk5t8T2X 0Qc7Xl98bPm8jahtrT7iYhtLpMFsz0PEkSM7K4cE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729549AbfCLRRU (ORCPT ); Tue, 12 Mar 2019 13:17:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:57956 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729039AbfCLRQN (ORCPT ); Tue, 12 Mar 2019 13:16:13 -0400 Received: from localhost (unknown [104.133.8.98]) (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 B1A1A2184E; Tue, 12 Mar 2019 17:16:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552410972; bh=x3vu7x/fkh54RFxNPxJpqc3uUW6I4b+4T1PyFT+ZLcc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qlTeVhAmzrWrLMkE7P3zjWEeLt3eB0+rEaM8Z4d+DjJITNqdENNAlD04a7uvOYxR9 rAwmrpbhCcaGgodAJB/rNw05xoVysuukYzVkjVC+mz4jUxS0DFDzUywjsDl2O4xdzZ ZyP1cxUKxpjx1wLGbMm7ObmNLRXvYPlRE60ixY3Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexey Khoroshilov , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 062/135] net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup() Date: Tue, 12 Mar 2019 10:08:29 -0700 Message-Id: <20190312170347.013421367@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190312170341.127810985@linuxfoundation.org> References: <20190312170341.127810985@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit c69c29a1a0a8f68cd87e98ba4a5a79fb8ef2a58c ] If phy_power_on() fails in rk_gmac_powerup(), clocks are left enabled. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c index 13133b30b575..01787344f6e5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1284,8 +1284,10 @@ static int rk_gmac_powerup(struct rk_priv_data *bsp_priv) } ret = phy_power_on(bsp_priv, true); - if (ret) + if (ret) { + gmac_clk_enable(bsp_priv, false); return ret; + } pm_runtime_enable(dev); pm_runtime_get_sync(dev); -- 2.19.1