Received: by 10.223.185.116 with SMTP id b49csp1045552wrg; Fri, 23 Feb 2018 10:56:12 -0800 (PST) X-Google-Smtp-Source: AH8x224NSoyQv5OL5KGz8IPplfxrgTerjKcz5UPUAY7GWUtmZNG+QGCYV3LdpynuWldt/PS8Tr5N X-Received: by 10.98.99.199 with SMTP id x190mr2701126pfb.68.1519412172406; Fri, 23 Feb 2018 10:56:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519412172; cv=none; d=google.com; s=arc-20160816; b=XNpn1hl4c00lZC0/srL5zHfBQHh2IcO65ZVwPyU+PdllDyqPmhzwdMvhMkh2Dp0wRC WhiXYgglx8TrsSl57MFeGyetm/p+wHSP4GjSqmxzFRv+6PlNyQZoKGKNg+gV/FWWbK2n P5KNI5gCkbuVffhuhH0cXCweT32hwVYjs4vjo6yFcQNksjRG/n55M/ln4TJNJBQ0syDI 8t5OV11L3HkuMBZy4BbTIahqYAdOzAUAbeQ7ZXCUN6o2S0q2YFyjcD5kY1rh9FO3hK6G mbruzwPwBpfbnN0tU1d9TQT+eUSpKYOdLdJzTTmEplV6SBIPUza5X9kqGqWGmycBeb/Z HH9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=1adxxiZ2NUJ/r+KJMMc/eIBlCyhOT17GD7j/Cz7lGc4=; b=xXywAqkllNNkAGJZ6/VcaIy+uQBCpLUUjh6XaBB1pwl0kBWe26ycWW1YnEIvi/lXP3 t688x0QONRGRK0vAlBXvgiP7Yjw6ocA2D8G14B3kdRAxk+Cr1NbVnuj0JUzgox5qfBb3 gLWanpna/XSqh1JA9tOr+1iVYpIZ+I4ZPDvB7N1NCZ+h5sfHHSJGElfmTZra4SmRqDpT +Aphcw3zvwP/KJ+sy1hx7ekc2KcC6IupIxCCOFprewx0sn3ntjxBfozGxtPMvOdKWCtG EuZDjE8KuDNfYkuQQ/bJ6rLHT8pW/8d0UhqhIBaxILcne5jLTP7vuavH52xf51uZRJYo RVAg== 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 8si2212274pfn.80.2018.02.23.10.55.52; Fri, 23 Feb 2018 10:56:12 -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 S965042AbeBWSyz (ORCPT + 99 others); Fri, 23 Feb 2018 13:54:55 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47950 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965013AbeBWSyv (ORCPT ); Fri, 23 Feb 2018 13:54:51 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id E16AF123A; Fri, 23 Feb 2018 18:54:50 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Branislav Radocaj , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 123/159] net: ethernet: arc: fix error handling in emac_rockchip_probe Date: Fri, 23 Feb 2018 19:27:11 +0100 Message-Id: <20180223170758.114603707@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180223170743.086611315@linuxfoundation.org> References: <20180223170743.086611315@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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. ------------------ From: Branislav Radocaj [ Upstream commit e46772a6946a7d1f3fbbc1415871851d6651f1d4 ] If clk_set_rate() fails, we should disable clk before return. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Branislav Radocaj Signed-off-by: David S. Miller Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/arc/emac_rockchip.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -220,9 +220,11 @@ static int emac_rockchip_probe(struct pl /* RMII TX/RX needs always a rate of 25MHz */ err = clk_set_rate(priv->macclk, 25000000); - if (err) + if (err) { dev_err(dev, "failed to change mac clock rate (%d)\n", err); + goto out_clk_disable_macclk; + } } err = arc_emac_probe(ndev, interface); @@ -232,7 +234,8 @@ static int emac_rockchip_probe(struct pl } return 0; - +out_clk_disable_macclk: + clk_disable_unprepare(priv->macclk); out_regulator_disable: if (priv->regulator) regulator_disable(priv->regulator);