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.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 C57BAC43381 for ; Sat, 23 Feb 2019 21:16:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9200220651 for ; Sat, 23 Feb 2019 21:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956602; bh=2GSmhNgHDxJDqUPISafChk91TEVOjQXYiQGcAdc5Pyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=d1p08eE4iaXBSs7i3ALvNmUeTLOWeTXdqOJYpoP11yX2q6zmw6IMpeVBv0qUc1qw8 IqxQ+KSIlnJLI1RnF5Gxd6WTjJHO+IGRz/TbEvr3u2bC326WNILwe7WdQOzBQw1NVP 67cnVFTxVYhriZ5yely/kvnS6eVn4cqpP5qJKZRY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729069AbfBWVQi (ORCPT ); Sat, 23 Feb 2019 16:16:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:46398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729741AbfBWVKV (ORCPT ); Sat, 23 Feb 2019 16:10:21 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A85E820861; Sat, 23 Feb 2019 21:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550956221; bh=2GSmhNgHDxJDqUPISafChk91TEVOjQXYiQGcAdc5Pyc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NAo7aOuadmdN7+GU1K/rXMjOR447mZwz/xvbi/6blareDOVZD/dqH1VI7ITRcyQbK uYSTM8J/XqmKn1d4jRg3pycBRMlMdP4bgPSZR06Bi6C2XLmp5fJmJWSzLfjkNkTEMx 6lG1NI+KqH2dyTHSEsasgfKq1VDJguKyxTUOq/zM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alexey Khoroshilov , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 18/32] net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup() Date: Sat, 23 Feb 2019 16:09:37 -0500 Message-Id: <20190223210951.202268-18-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190223210951.202268-1-sashal@kernel.org> References: <20190223210951.202268-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alexey Khoroshilov [ 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 d80c88bd2bba8..6e61bccc90b3c 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -877,8 +877,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; + } ret = gmac_clk_enable(bsp_priv, true); if (ret) -- 2.19.1