Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp6560474ybx; Mon, 11 Nov 2019 10:58:46 -0800 (PST) X-Google-Smtp-Source: APXvYqyzz1AcGnTGAYkF9M3iymoOZDo7Y69AIbhrAhsZXHtds3Ax1LGjFWaAA0Boo+B4tL6z8jWB X-Received: by 2002:a50:f30c:: with SMTP id p12mr27590602edm.208.1573498726625; Mon, 11 Nov 2019 10:58:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573498726; cv=none; d=google.com; s=arc-20160816; b=rn/Ax+MKQTvULTWtZIN8TY8rKf0498ZCKZtsFYsAPmYp8e4xB7IpwE8WJx85H3NPTU /vb41PA0IfuTshsk5b1YTwkp77WBbHQwpSFiClzBC7KfCUkJ7opiVZzauHAq7nFR0QXA u8ae4CofZFK2iiDlWsNRBKMEKpHnNUX2UR0G2SkmKjbaMlxO7DXp/9yFtsMhW1YHheVi Qcd8PEAVEVBrGHsxmUpz8V7gKkz8JFzgKjGfp+49oSDwpV3xdNY9gIxicztZXHI+YSex 6dk0HK1YZAHj0X55dGw3mgqSjS0P/1ovhySZV96ND8eRc3hxW0hDKpvT2TT0bkAe6dSR vjEA== 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=o1UZOZQdwk9kKb5hknl6Cr4QRl7/i49YlqWfS8P8/r4=; b=EO9cvaN1vMAHoEYmtJ4yISuT4bBkkgL9z30+U4STfwzCZYmqsgmlWgf0ptGR3iw9LT LkYgBdvJLKhsve9/WlJDsLHWmgZ9fx/Isbpj0FAeXhaHTb5gbPobhRV7AM95xe1GtOTI 5UkvVDHLhDDzoaPhDaHKae7vgWy+v7Xw4FC+ut3bwMqQup6UqseMRTyYOpybbWO9BuCY 1jYHv5fRzW3wMKX5hGfWLIV4iVhVQz2vFmW0TRRKp2tMaF5AuapZHDeyvvCfwAEsnnK3 AGG2CPASIgucYBrVHFmEbFiME/0r34rT1zXkXy+0iBfUAKpz7rL3RC/P3Ekq5mXaxara +B2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=GAR0e+Np; 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 w17si12099296edc.152.2019.11.11.10.58.22; Mon, 11 Nov 2019 10:58:46 -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=GAR0e+Np; 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 S1730886AbfKKS5s (ORCPT + 99 others); Mon, 11 Nov 2019 13:57:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:57680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730875AbfKKS5r (ORCPT ); Mon, 11 Nov 2019 13:57:47 -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 DD40B222C1; Mon, 11 Nov 2019 18:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498666; bh=ft2LN6sxaEL+8IXj42ft2Jj8GwRyf4ZeA3bdcoIl+E4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GAR0e+NpFEPFTzp9Rxnoaj3V49hgjuzZyQJJ0mcHPyD6MggxyCmhQFPSzUtpggINg FEwjRPEdao5BNFmwsQhcMh2SB92HgAtH79t2JfwKSzcMQGoYteeMY0uYFlqAUmOEKL wd356vMyKR7tVy8ehBYmZUjp7rnz5jfxx5Dj1tvQ= 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 5.3 184/193] net: ethernet: arc: add the missed clk_disable_unprepare Date: Mon, 11 Nov 2019 19:29:26 +0100 Message-Id: <20191111181514.671516170@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181459.850623879@linuxfoundation.org> References: <20191111181459.850623879@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 42d2e1b02c440..664d664e09250 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -256,6 +256,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