Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1831892imu; Sat, 26 Jan 2019 11:50:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN7KmI8848YStjVKCoNYrB8Rr4gabnl3EPm7Uh81+qixGnkKrwqjoHEkBIOlCUwLW8F4sZot X-Received: by 2002:a17:902:9897:: with SMTP id s23mr15375289plp.69.1548532204006; Sat, 26 Jan 2019 11:50:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548532203; cv=none; d=google.com; s=arc-20160816; b=Py7eqcNUrJFj6MbcdC3DrkxTPfMoVP3sD9kfCaUi60UhM3H9WO38RDGEdq9HFGf60u fRoNwCrcfFRInZ6Vw/tFhHmRQmP38m4ETGYd4UMDhxYdWXf4tT7vIk0Mih8V0l4R5Sj5 fP5QLDum/RI9VJ6SEk4lK0scRI1Ox2GlvYyLod1E3/VWFfFXMzIeXsxc1gDa1D2KcBxX pt1jtAlIwlgEb+oj8oLZ0ZBANndWRpjkVXXyPw055wuS4qwQKxnTE1aHTyNS7dvKYsiP /2pmmLNF4UFqYbKrgd93byrJgHjjxKwfnPKbJ2t2lN6Zwthzu/J7Nadh20VaX5/4aS1b 86aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from; bh=4htZxkyqUQGKPQkCe5TsWgNcEFWslwspzoVDM+rSXMM=; b=D8lfVQg3HMykEYseLKpF9iibIKua1b6y6ykAGr3eRo2JoHM0o2Kb2h/rypHW/IiDy/ XYc4Gq4+zuhWCmesOGWpcb4vXkN2pD8DspOYCZVyDYzZeZEaq9uRPcMRpA0yTpD8hKxg /KX7idPZz9jnb4CGjYY14+TAKJj1zxkFSmIe5zAFnmOkxtNGOOvbUjxYLi6ow41y2YHW aUnk0j/2FbJe3kUJQ3SYSCDSBuv5IG9LlgFbWV8G0YzCg7fFRusgkkVUobvyRxZno6sU t9Yfo4ExZIed9YnvMk8wWLDHmiDuJWViJ3x8WVMryR+uFgLiq1qmZAVJ1U+Yk0d+4/N0 VSvA== ARC-Authentication-Results: i=1; mx.google.com; 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 d16si28338460pfn.169.2019.01.26.11.49.49; Sat, 26 Jan 2019 11:50:03 -0800 (PST) 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; 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 S1726407AbfAZTtQ (ORCPT + 99 others); Sat, 26 Jan 2019 14:49:16 -0500 Received: from mail.ispras.ru ([83.149.199.45]:37816 "EHLO mail.ispras.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726189AbfAZTtQ (ORCPT ); Sat, 26 Jan 2019 14:49:16 -0500 Received: from localhost.localdomain (109-252-62-199.nat.spd-mgts.ru [109.252.62.199]) by mail.ispras.ru (Postfix) with ESMTPSA id 50449540082; Sat, 26 Jan 2019 22:49:12 +0300 (MSK) From: Alexey Khoroshilov To: David Wu Cc: Alexey Khoroshilov , Giuseppe Cavallaro , Jose Abreu , "David S. Miller" , netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ldv-project@linuxtesting.org Subject: [PATCH] net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup() Date: Sat, 26 Jan 2019 22:48:57 +0300 Message-Id: <1548532137-15618-1-git-send-email-khoroshilov@ispras.ru> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 7b923362ee55..3b174eae77c1 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.7.4