From patchwork Sun Jul 21 16:25:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 260535 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 253D02C0092 for ; Mon, 22 Jul 2013 02:31:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755868Ab3GUQbh (ORCPT ); Sun, 21 Jul 2013 12:31:37 -0400 Received: from mail-gg0-f179.google.com ([209.85.161.179]:36773 "EHLO mail-gg0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755793Ab3GUQbg (ORCPT ); Sun, 21 Jul 2013 12:31:36 -0400 Received: by mail-gg0-f179.google.com with SMTP id c2so1850561ggn.38 for ; Sun, 21 Jul 2013 09:31:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=Xkdhg0NVqBDxpkdcWWVLD6xLcZaZWNyG6HxqK4IYITo=; b=M64lzT0BbaA6Gpr+PXqyP5yc2/JHCsrsx+SztYZpmZivgddVQBux+s0P/I8eXenNSf +sEB+ZkqWdTaBRknl0wBvMgUO5H+hqXlfPyjHjN7IBjVNEeEI7f09YVbJZgkh5mMtMQR Z+sEnL13SoIqSv/wF3Xu4h++voDzyxyY7z6R3dHwOhWooY0umQRr5VZBBU0q1WjQRAxc +8ulqj9mArCzyu18T7MN0sFblXEwtVAvUGUOydP/meW6fLGZG4dGTd8PwLisbvcWDYs1 8+CJO2SIjg+vy9h9319uDpPwY/CFbrT1KkAZgPgc+094OXOO3ziumRpz5YKUqBuI03Ld uECg== X-Received: by 10.236.27.234 with SMTP id e70mr12089760yha.15.1374423936081; Sun, 21 Jul 2013 09:25:36 -0700 (PDT) Received: from localhost.localdomain ([189.5.19.145]) by mx.google.com with ESMTPSA id i27sm34053395yhj.24.2013.07.21.09.25.34 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Jul 2013 09:25:35 -0700 (PDT) From: Fabio Estevam To: davem@davemloft.net Cc: kernel@pengutronix.de, Frank.Li@freescale.com, shawn.guo@linaro.org, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH 2/6] fec: Fix the order for enabling/disabling the clocks Date: Sun, 21 Jul 2013 13:25:00 -0300 Message-Id: <1374423904-2668-3-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374423904-2668-1-git-send-email-festevam@gmail.com> References: <1374423904-2668-1-git-send-email-festevam@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Fabio Estevam On fec_probe the clocks are enabled in the following order: clk_ahb -> clk_ipg -> clk_enet_out -> clk_ptp , so in the error and remove paths we should disabled them in the opposite order. Also fix the order in the suspend/resume functions. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec_main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index de9bf7a..5e82200 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2179,12 +2179,12 @@ failed_init: if (fep->reg_phy) regulator_disable(fep->reg_phy); failed_regulator: - clk_disable_unprepare(fep->clk_ahb); - clk_disable_unprepare(fep->clk_ipg); - if (fep->clk_enet_out) - clk_disable_unprepare(fep->clk_enet_out); if (fep->clk_ptp) clk_disable_unprepare(fep->clk_ptp); + if (fep->clk_enet_out) + clk_disable_unprepare(fep->clk_enet_out); + clk_disable_unprepare(fep->clk_ipg); + clk_disable_unprepare(fep->clk_ahb); failed_clk: failed_ioremap: free_netdev(ndev); @@ -2216,8 +2216,8 @@ fec_drv_remove(struct platform_device *pdev) ptp_clock_unregister(fep->ptp_clock); if (fep->clk_enet_out) clk_disable_unprepare(fep->clk_enet_out); - clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); + clk_disable_unprepare(fep->clk_ahb); free_netdev(ndev); return 0; @@ -2236,8 +2236,8 @@ fec_suspend(struct device *dev) } if (fep->clk_enet_out) clk_disable_unprepare(fep->clk_enet_out); - clk_disable_unprepare(fep->clk_ahb); clk_disable_unprepare(fep->clk_ipg); + clk_disable_unprepare(fep->clk_ahb); if (fep->reg_phy) regulator_disable(fep->reg_phy); @@ -2258,10 +2258,10 @@ fec_resume(struct device *dev) return ret; } - if (fep->clk_enet_out) - clk_prepare_enable(fep->clk_enet_out); clk_prepare_enable(fep->clk_ahb); clk_prepare_enable(fep->clk_ipg); + if (fep->clk_enet_out) + clk_prepare_enable(fep->clk_enet_out); if (netif_running(ndev)) { fec_restart(ndev, fep->full_duplex); netif_device_attach(ndev);