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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,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 CB639C43331 for ; Mon, 11 Nov 2019 18:39:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 993DE204FD for ; Mon, 11 Nov 2019 18:39:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497569; bh=jbszZ+pK438idjmG/hhKzxYfkMI4SQrnmhW1whPaf/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=d2QLbQC8kJoTRiGpB7UnFuYeg+ECO5YP/C/9qXiSfuqIbaBQE/SRf9r7ELcgK7xYQ 12qlm9QUaLCTUfGnyUEgBY6SJAehAzWvU6/tTxfIz+cosO1X+fOyZtZQlWw3FrKXBe NEMV2rmPusr3o2wkuWIU/4srK9cq3EIVsPy/eZNc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727974AbfKKSj2 (ORCPT ); Mon, 11 Nov 2019 13:39:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:58386 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729150AbfKKSjT (ORCPT ); Mon, 11 Nov 2019 13:39:19 -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 C5E7D20659; Mon, 11 Nov 2019 18:39:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497559; bh=jbszZ+pK438idjmG/hhKzxYfkMI4SQrnmhW1whPaf/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIeWJLEeSwxPQsbeattYGh8+dIetGqrqMPw8BT3UTt9R9u1oTcNlgzoqfTkHz20kb mG0IfdeFbpgZRDjW+xIdIW5QdPgtGFfKY8LfHHsjdqT+DQwDPJ/OavRmdc21/EqdE3 Bsr7pO1W2MkHz8uz/vF4e4t/jI8mt0KGIuhwnVvk= 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.14 097/105] net: ethernet: arc: add the missed clk_disable_unprepare Date: Mon, 11 Nov 2019 19:29:07 +0100 Message-Id: <20191111181448.809234612@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181421.390326245@linuxfoundation.org> References: <20191111181421.390326245@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 c770ca37c9b21..a7d30731d376f 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -261,6 +261,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