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=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 E974EC10F0B for ; Sat, 23 Feb 2019 21:31:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB54E20661 for ; Sat, 23 Feb 2019 21:31:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550957495; bh=0wAdm/E95RxO/zPIMzhmA/PQ9elJXJ4NPAQ5bRbnkdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=l0gecPJ4QBIBxApS82nB7nN4V/0T1jwVUe36eLXsaXhe8Kmobu9NzDts76LL675rO TMZjKaQSqC7l3xhS8DihH6y1Kbxc3wPYxU3hU8BgIBSh5wWBo8jgUS+l2aajKBfGKV 1YUnFB1wNFZYEatUfTuewEXWwSgKppBxlUDBGmtQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728408AbfBWVFd (ORCPT ); Sat, 23 Feb 2019 16:05:33 -0500 Received: from mail.kernel.org ([198.145.29.99]:40568 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728350AbfBWVF0 (ORCPT ); Sat, 23 Feb 2019 16:05:26 -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 4DE0620675; Sat, 23 Feb 2019 21:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550955926; bh=0wAdm/E95RxO/zPIMzhmA/PQ9elJXJ4NPAQ5bRbnkdg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yLcCOXUtIQWHso5kp+OQIS+5TzbPjyeBbB6EkpRvvKVsdvmBommu52xFV4eL7VtCk fNjWSMdYX2ZrTACKTdC5a14iuDvqiDBwIJAh486v/MFSEK6OwCDaYGjwU4ZzdI/WEa SG+PiHczu7U8YnR7lihCfbPCeGOblH8Q2lxsGRQ4= 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.20 36/72] net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup() Date: Sat, 23 Feb 2019 16:03:46 -0500 Message-Id: <20190223210422.199966-36-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190223210422.199966-1-sashal@kernel.org> References: <20190223210422.199966-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 7b923362ee550..3b174eae77c10 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c @@ -1342,8 +1342,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