From patchwork Fri Mar 10 16:34:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 737453 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 3vftCz51x4z9s7t for ; Sat, 11 Mar 2017 03:35:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LTOoZ3ur"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933289AbdCJQfY (ORCPT ); Fri, 10 Mar 2017 11:35:24 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:35728 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932769AbdCJQfK (ORCPT ); Fri, 10 Mar 2017 11:35:10 -0500 Received: by mail-wr0-f194.google.com with SMTP id u108so12241864wrb.2; Fri, 10 Mar 2017 08:35:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eYv578eqeBZySDxReBju0d5LiYDvOG9f5HIzuMlWUn8=; b=LTOoZ3urzfXOe3AypPjzKZSnJZ9blIcnNZutAh5vjGzjj8LDtPadvjoCfBRiGGffuz 7/FykdyitglPbkjA8VnmS+/QcAVcV+oWiFXH3qVi5D3DiNx3QqiXPfwQx+pOGG2DoVJO kmCVMERF2a3gd4O3GLrdJNE5SuoRP3SaP2g+/LSQ6pEOcypoFfib6wQlcB6HNcI8v0RH uChbVZkqxW1gckezXjnHTH2LSWEta/62oqhbXf/r22s0DIDepSqKnNiTV44hH8ztT0Pp UWnnIGoPbnxaiuVDPMbH/VzepSoXshb6bevgQ0do3M7BGzH10sfV7YcWBmBaH34zQw8M ToLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eYv578eqeBZySDxReBju0d5LiYDvOG9f5HIzuMlWUn8=; b=Nq+l4kkpKmgvsN6o83/QHmczfmY9sWniV9xUpd/TZF7xVhTXAB3vlapheWe3db6yom ZJCk9LTENU9Qx/qhgu9dYGbgEDH82QFt6fG0y+2Nbh/SEPd2wDE0rBQKIqRMTIy/u+Yy z2KZ8A9EwcvfksTdQBzTduBfFTIKXXi7I43J4EOPRSNbco9RPiPQ5J+M23S/QFCoyoP6 rtI5Vg9JrxTNX7NnlzwEZ2A9KUBDIHh4DBlbHdISF7CkjAiYnIKX4MI+70WSVcbFaSUZ 8ivKjn6E7mee/iZPEi/6fGVakqQTxPVTRSDbSdgRPV8uEBHzAafXmGytnzBzas7ZB4kJ nmww== X-Gm-Message-State: AMke39mGDx0Vzo03Gv3UskHnrrt5ZRTnlPAdF1ex0tKBLs5nBcYCHjofK3Cec9dfmVPoPg== X-Received: by 10.223.137.2 with SMTP id s2mr18163791wrs.20.1489163708522; Fri, 10 Mar 2017 08:35:08 -0800 (PST) Received: from localhost (port-55061.pppoe.wtnet.de. [46.59.215.197]) by smtp.gmail.com with ESMTPSA id 94sm13494902wrl.50.2017.03.10.08.35.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 Mar 2017 08:35:07 -0800 (PST) From: Thierry Reding To: "David S . Miller" Cc: Giuseppe Cavallaro , Alexandre Torgue , Joao Pinto , Jon Hunter , Mikko Perttunen , netdev@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/9] net: stmmac: Disable PTP reference clock on error Date: Fri, 10 Mar 2017 17:34:55 +0100 Message-Id: <20170310163501.31811-4-thierry.reding@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170310163501.31811-1-thierry.reding@gmail.com> References: <20170310163501.31811-1-thierry.reding@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thierry Reding If an error occurs while opening the device, make sure to disable the PTP reference clock. Signed-off-by: Thierry Reding --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 7c38c9baf238..6060410d2b9e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1754,6 +1754,13 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) return 0; } +static void stmmac_hw_teardown(struct net_device *dev) +{ + struct stmmac_priv *priv = netdev_priv(dev); + + clk_disable_unprepare(priv->plat->clk_ptp_ref); +} + /** * stmmac_open - open entry point of the driver * @dev : pointer to the device structure. @@ -1863,6 +1870,7 @@ static int stmmac_open(struct net_device *dev) phy_stop(dev->phydev); del_timer_sync(&priv->txtimer); + stmmac_hw_teardown(dev); init_error: free_dma_desc_resources(priv); dma_desc_error: