Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp6550473ybx; Mon, 11 Nov 2019 10:48:06 -0800 (PST) X-Google-Smtp-Source: APXvYqzAR6994JFY2oAWnDPjqphhT1/QaNs/Zt4JTrcWeJn2OQCjnyJUGP0y1fcIxa5IqMb05q6T X-Received: by 2002:aa7:dcc4:: with SMTP id w4mr28394373edu.161.1573498085883; Mon, 11 Nov 2019 10:48:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573498085; cv=none; d=google.com; s=arc-20160816; b=YzLBOmBCG3aexCNHglG2q39528vuh+p3X1W8KmJU1ZaXaFLct6YCzAI/8FukS6WsHE fKAheJQNltWJCmQaIFjG3syj9zJe8mXF0wb8r9juUMvghQ7k5zrOdLKLJop36E26YLg7 4QzJC9Vu3WtN0diRTce/Usmz50P2BWuOc2FU37wJVBtCE9wHTgVE+flem0WrdaCZFLPS DfCuNg3t1Rl6jaZ/pOWpyx5I2C0bvK5Py/2ezplA1YswGORlOkg3q/PGg++El30kTHdK uEHghZqHEsuf8kK3wkx8RJzVYVwsbuGhSCBpwbQJj10h5l9EOJP1T/uZF5XdL21dft+5 UAjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7mG7fJpLD+zfpJyd0CARRJKHb54MKhB5ByjWLf5/r+M=; b=uyEyvOnqm8jMy462aYvETaNIZSp0vUiJPUxRuAb6hmAa91Xg6fCaG16Psf9GbRnB+D Gxb03ES3csLlOxViVCX8olUPrbqRyDJJj0k4ZsbhUPE/ofsZOZ84jm8BjDMZSbO6vhNV kHyEnjU7rDaySOJyLm1dky/zmyTywj2FY5YAwOroSJk/zfuG0/+3AV6MsLEivXp1EcgN YCWLTEungR4B/yl8bxDv0/1OjriLeLqZMsZBmj/LB7fyavB1Ndm/P892VFtP9x3HVYs6 BwUaUzobxMaTOnb5LKumxz1PRcMEmOodu3BEMf8uHIzYCZeZm4TgqgGwIT07dOtPElRN Oc3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="V+tzj/+G"; 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 o10si13747216edj.316.2019.11.11.10.47.42; Mon, 11 Nov 2019 10:48:05 -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; dkim=pass header.i=@kernel.org header.s=default header.b="V+tzj/+G"; 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 S1728945AbfKKSqa (ORCPT + 99 others); Mon, 11 Nov 2019 13:46:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:38978 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730006AbfKKSq3 (ORCPT ); Mon, 11 Nov 2019 13:46:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 BE9B721783; Mon, 11 Nov 2019 18:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497988; bh=zpUcZ+oBkJmWgjCKBCcDcw/Qeg1OskxaYaBdQ+im6A8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V+tzj/+GQZFBT2XI9O0BJqtcYwFtQP3SdyB5jPqTJFlEiZzu6lXfz/hen2+0cVa52 W+o/oTO4lN+p9+ndFp28A4mW1QvMop8furhBto1IrBINqJYggAnyqeMAIerKIflsnl fkc6i3ChCbg7Nr/57ZAKGRPtSnsQiCtJQ3RjJ6y4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chuhong Yuan , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 115/125] net: ethernet: arc: add the missed clk_disable_unprepare Date: Mon, 11 Nov 2019 19:29:14 +0100 Message-Id: <20191111181455.255030663@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181438.945353076@linuxfoundation.org> References: <20191111181438.945353076@linuxfoundation.org> User-Agent: quilt/0.66 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 From: Chuhong Yuan [ Upstream commit 4202e219edd6cc164c042e16fa327525410705ae ] The remove misses to disable and unprepare priv->macclk like what is done when probe fails. Add the missed call in remove. Signed-off-by: Chuhong Yuan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/arc/emac_rockchip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c index 0f65768026072..a1df2ebab07f0 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -265,6 +265,9 @@ static int emac_rockchip_remove(struct platform_device *pdev) if (priv->regulator) regulator_disable(priv->regulator); + if (priv->soc_data->need_div_macclk) + clk_disable_unprepare(priv->macclk); + free_netdev(ndev); return err; } -- 2.20.1