Received: by 10.223.185.111 with SMTP id b44csp919341wrg; Fri, 9 Mar 2018 16:52:30 -0800 (PST) X-Google-Smtp-Source: AG47ELs5c2CdhqQzs162MF2YjxlUYWowts/nCHAwVt4R+aFhh0EcZBaD1y7ohOm00cGWhEQ7mkbw X-Received: by 10.101.67.70 with SMTP id k6mr319713pgq.93.1520643150155; Fri, 09 Mar 2018 16:52:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520643150; cv=none; d=google.com; s=arc-20160816; b=D///XzrJ42ejBgZ6nsos0xvOwXWDGmEW79gO2V96C16zuQFIdrGYDk1Vm7u9AEA1aJ mtgP1MjP8ZzJYQi2vpctFox0iG6FoFAedZjA0q5O8pC7F5JG8KA4Gd3zoHFe5uO5pRWX /AYt+iZI7JX4wZtLwJ7wMudi3klFwvcesmbZ5qfzrdYyGexSVbaIx8faMu0JBrn/wABt PU/TQx86OeVrZs+t4vCv4xBvf4heAcl/31QAOd6xlcPmJRhU3O47QQkjqWyY/EAZCGxf h0gdi+4MYeA5smBHhu3jLB/ZpUdCEQUPPAAdSaaJRdu1bfnMd9vqhUD+m1mMI3fprGjj C0Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=yWH+ISqSKUYkN0oFJtXJ00MjCq0h2S4tpc08X/qNxHc=; b=a6gZuGC63vQlq6gf6wj1b4542JrGeXvKIoJN5zneAtuTyb9zOOPER1IcD55gs+80vE mKo6D/6VB/xJMMTyabK9yZg3H5saDmEenKGSJFhKFZgKClYX40U80ttDAXJyb0SqUN0D dfyEip77C6kiNhNf1nd+XmMv6/WOElGhKVXT7TbjMzAIuxa216fJUkseQh4hR8JPgm5a r7tVsMECYiNYrUIOfVdyBOe80ys2B3HGUMF7SvzO33oW2OJdlpij/UCpWUEkynANGMLt G4Hvw0iG9AeWgXIonOAfUpxhmj5XkgzSGNJUE0XMklVsnz8Wpi4Vc15TD8oeNokk4gX0 Mv7Q== ARC-Authentication-Results: i=1; mx.google.com; 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 d3-v6si1709681pll.1.2018.03.09.16.52.16; Fri, 09 Mar 2018 16:52:30 -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; 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 S932951AbeCJATM (ORCPT + 99 others); Fri, 9 Mar 2018 19:19:12 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:38508 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932909AbeCJATF (ORCPT ); Fri, 9 Mar 2018 19:19:05 -0500 Received: from localhost (unknown [185.236.200.248]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id EB800DB7; Sat, 10 Mar 2018 00:19:04 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas Stach , Fugang Duan , "David S. Miller" , Guenter Roeck Subject: [PATCH 3.18 06/21] net: fec: introduce fec_ptp_stop and use in probe fail path Date: Fri, 9 Mar 2018 16:18:28 -0800 Message-Id: <20180310001801.425145519@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180310001801.045114869@linuxfoundation.org> References: <20180310001801.045114869@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lucas Stach commit 32cba57ba74be58589aeb4cb6496183e46a5e3e5 upstream. This function frees resources and cancels delayed work item that have been initialized in fec_ptp_init(). Use this to do proper error handling if something goes wrong in probe function after fec_ptp_init has been called. Signed-off-by: Lucas Stach Acked-by: Fugang Duan Signed-off-by: David S. Miller [groeck: backport: context changes in .../fec_main.c] Signed-off-by: Guenter Roeck Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/freescale/fec.h | 1 + drivers/net/ethernet/freescale/fec_main.c | 5 ++--- drivers/net/ethernet/freescale/fec_ptp.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/freescale/fec.h +++ b/drivers/net/ethernet/freescale/fec.h @@ -546,6 +546,7 @@ struct fec_enet_private { }; void fec_ptp_init(struct platform_device *pdev); +void fec_ptp_stop(struct platform_device *pdev); void fec_ptp_start_cyclecounter(struct net_device *ndev); int fec_ptp_set(struct net_device *ndev, struct ifreq *ifr); int fec_ptp_get(struct net_device *ndev, struct ifreq *ifr); --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3312,6 +3312,7 @@ failed_register: failed_mii_init: failed_irq: failed_init: + fec_ptp_stop(pdev); if (fep->reg_phy) regulator_disable(fep->reg_phy); failed_regulator: @@ -3331,14 +3332,12 @@ fec_drv_remove(struct platform_device *p struct net_device *ndev = platform_get_drvdata(pdev); struct fec_enet_private *fep = netdev_priv(ndev); - cancel_delayed_work_sync(&fep->time_keep); cancel_work_sync(&fep->tx_timeout_work); + fec_ptp_stop(pdev); unregister_netdev(ndev); fec_enet_mii_remove(fep); if (fep->reg_phy) regulator_disable(fep->reg_phy); - if (fep->ptp_clock) - ptp_clock_unregister(fep->ptp_clock); fec_enet_clk_enable(ndev, false); of_node_put(fep->phy_node); free_netdev(ndev); --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c @@ -620,6 +620,16 @@ void fec_ptp_init(struct platform_device schedule_delayed_work(&fep->time_keep, HZ); } +void fec_ptp_stop(struct platform_device *pdev) +{ + struct net_device *ndev = platform_get_drvdata(pdev); + struct fec_enet_private *fep = netdev_priv(ndev); + + cancel_delayed_work_sync(&fep->time_keep); + if (fep->ptp_clock) + ptp_clock_unregister(fep->ptp_clock); +} + /** * fec_ptp_check_pps_event * @fep: the fec_enet_private structure handle