From patchwork Thu Jan 4 02:47:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Duan X-Patchwork-Id: 855353 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zBskW6BG9z9s7M for ; Thu, 4 Jan 2018 13:51:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752031AbeADCvN (ORCPT ); Wed, 3 Jan 2018 21:51:13 -0500 Received: from mail-by2nam03on0059.outbound.protection.outlook.com ([104.47.42.59]:21755 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751967AbeADCvM (ORCPT ); Wed, 3 Jan 2018 21:51:12 -0500 Received: from CY4PR03CA0098.namprd03.prod.outlook.com (2603:10b6:910:4d::39) by SN2PR03MB2365.namprd03.prod.outlook.com (2603:10b6:804:e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Thu, 4 Jan 2018 02:51:11 +0000 Received: from BY2FFO11FD043.protection.gbl (2a01:111:f400:7c0c::162) by CY4PR03CA0098.outlook.office365.com (2603:10b6:910:4d::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Thu, 4 Jan 2018 02:51:11 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD043.mail.protection.outlook.com (10.1.14.228) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Thu, 4 Jan 2018 02:50:45 +0000 Received: from b54642-OptiPlex-3020.ap.freescale.net (b54642-OptiPlex-3020.ap.freescale.net [10.192.242.250]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w042p7Ng018529; Wed, 3 Jan 2018 19:51:08 -0700 From: Fugang Duan To: , CC: , , Subject: [PATCH net, stable 1/1] net: fec: free/restore resource in related probe error pathes Date: Thu, 4 Jan 2018 10:47:20 +0800 Message-ID: <1515034040-12482-1-git-send-email-fugang.duan@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131595078454612589; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(336005)(39860400002)(346002)(376002)(39380400002)(396003)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(39060400002)(54906003)(105606002)(36756003)(4326008)(16586007)(305945005)(316002)(86362001)(51416003)(85426001)(6666003)(59450400001)(97736004)(81166006)(2906002)(106466001)(8656006)(498600001)(5660300001)(68736007)(77096006)(47776003)(104016004)(50226002)(50466002)(53936002)(356003)(8936002)(110136005)(8676002)(48376002)(81156014)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2365; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD043; 1:YkM45JBGBaNs4PMJZJX8mSs8cNHXXhAh4nJQOyAfwoNSCiXxftYwRptTZipKVeFeHGErDPbDZFxczoYd0T+fC6BYZb5RXBBaBE5nG06HkcKpK9FcxL8yx6toJ3GX001T MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 81f8d0d0-736f-462d-126d-08d5531df3f1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:SN2PR03MB2365; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 3:SSDrO2C552E9zMgfhFA8o712WQ+5AwCDMBwAQ9LFul+ZAgLyRcvRFRcdF+pdSPDrI2icL16yGxB5lWH2UkDtCOqYEKcD5Ww2uov9rNdCuuciulW3P/k36m+RmEb4I3EjagJFrNFaJpQFvUy76Ii53tgjW5WQwbVBI5/NV04/qixVO9pa01rJucWPX7U8CM9mnx5/cUL1H61Z2052XcYqomfstJDA0PvQU+FCw6mut9E+DIUt7Pg96ipXUeW196UcMgtRuNWJkOaqKQPTFzluw7tKEfQ3BEX0ZhiyDpSsBmMyMzy0NDu1umGiMQGsrmlfahXpXS2d4u2G65q01pl0qlI5iHqqqiVBjRBKzvCt9DU=; 25:yaqvCT2WjyT04icU+t2Vh4bc65/Uho+htRB4ZLXLVVp+kxf9PGCHGJxgz7key5T2d8CamgFsyZZNz71Yrzn/y146nvDcumkkQnxEbO6OV+JzU92YH0HvQckMf1fRjLuYQHSHv15ZzycSEoDPV4NYuBCJoTQ9BysnejcsiqjoG0GMU7ihexVUtttk4fRhcPthKP8q/glL7oHSRGo7kTL85GFUMW8Bkk5hA6sqAWKzMb2xGjA2ZAHKJbYQKHu4Ww+Pfy7OkmT/UGAeE8NVcepjBCnwBOfDSCSpFGf1o52LHCx/RMeCA15ZuepivekOTnrDzIKxye6cJOk8So9b0yIXiQ== X-MS-TrafficTypeDiagnostic: SN2PR03MB2365: X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 31:/69ihc5b5jfncpfHRavo5+f9Or5d/VtYP9NQ3gVqiTihrcq7TaC4Clyz8zVa8wmuGz7H1EHyUixnS4bKDT6cpSTKXPjCsC7kCXE+ksg8YyMS+9wFLgjaG2ijByr8MuphUQXq2R/6ogltUFvIuWiOB1Vu//n16DjJ9SvkaMLcotyrhZH/437YPGxFH7sHlzrVbRArfAfNfmiDFg9+czQRWNfbCXRnFEVSrMaP3f+cvI0=; 4:pZQhbzHeSL0bJ2f/NDkyQFYfqMZr82DXz2OUVfyYDPhNKWvK0Tkgo9o8vuCE721ICgw38tPqEb66sK/zUhYpIL0IFlB8IZj0XXpsazCGRZl2TnlYHZn5D0QvdHeLKJgzSOwIYWgUn5wL1KBxI3glpeV533/dK1ZXx0gsitoMbo+a2ufgLKmxBp+HqbCTq81ugz6mOQW8MRTckRFgaRImm8yZ3YOPgl6qdHgEptb78XrwXgHlbrEXBrBsSNPBmbn8sxdqHbWciSTVvEdD+xzNytnryXbJMjzUtN0Y+DtgDJ5rgk7SYkoCC0SBmE0HrJiy X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231023)(944510075)(944921075)(946801075)(946901075)(93006095)(93001095)(6055026)(6096035)(20161123565025)(20161123559100)(20161123556025)(20161123563025)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123561025)(201708071742011); SRVR:SN2PR03MB2365; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:SN2PR03MB2365; X-Forefront-PRVS: 054231DC40 X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 23:9GhVecUt8eU5zhRf+z3xd1dncyGt32UvJPqA8Jk0n+G5C+3J9pQeOWKKJo4WYSaUbI2xK+FvhtqeKiJFz+1ZtkQoOw4WI4ixtKWkejm/wUsA3fwJ3UHKrVN7mRxdF0WHVER61gvvut+upMhjCYQEeBBzW8an+JqpTR0ax8b3ouNpozncTrtMJZzkb0LABPT8ZRP1y4NSncSMSljBAkimvBlkPK9XEzHu9PfmQzl7atYfdTIyaimdxzUAwwhOsXnuF7fwEoHvNhNFjbStJR54ocqPVEt0S9sSqBIyFfCeACpf66bFSuMHYbE8s6I1kdi11j0LQXLI8dTfG42IW5bco/oY6+2+319lQYvT0ZQKEh631Ge75vXFJiZkCEGrJAY3GMRjfEolqs2ALqwVPHjkpLNxLjCeGuExljLVKTGbNv8cgFm1KawAduAB/Zook5gKFp0HgdM07/Snn/H2octpffRj1KaXAiAznnXcIcppRcIsNQNL+K+Hs/lCzeBqbMMmdlMDCjbFqT26cUqRGNjX+0F9NT6JRHGNZHhfFVh+No1Ucddm4dfB3TOsjcSHnLwTE/Gk8bUQ3dPgUcxQs5nWbaoza4UUgnqcLGCw+oDTZErADFro/861qUz4P8ZRsc070zwsY4UPLPH/ZuF4hDFefp+rXcerGOP2HiLsbgUcAa09GrvFqsfqCEoKk7rcpTysjm68IpQyHP1nWOUKkHmDn01xuJiHElCWZZiLNqyRYcTZvQs54j6i7dbBY3TJ++APALaKLU0yd0OB1AxMzImjFkwnUYbNTxCANnX2OuWCfSKNM6eBCmShr4yGSdGfIaa+9eExVzVXAGw+I30+ijUKnTqiJBMVPjQ4IZ1zFUo0AP6EEpfIbpU6MG4IqQmr5u0rnFKUHqpbuaRwqMzprAAtyIHcL65mulqGfmeHYZexA6/vTCkMyqgye+T82ZEk6xpJ3PUP8s4dyE3E9hl4tN1aZwclnGeczdSAlM1TueRNTcmJ5eEpv7dR6TNd38lecUNeKQrhwaTzU4FkWR21iwQy/QmJ3wQ4GJhe7p5Re0T3SOytTZHec3WmyyRPtQM2vsZbLx4dtIHVRaIhYTWI1RfFug== X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2365; 6:Ge3a/VV58HxZv6buqmcyTx1ZzBWaspZ+WxqkPFtCRFe9ecB40EYFLm3oU7ciTy+L6s8N8azcWrEjS3/XyGHOtDfCbC5bzpQjfVrowVkCQ62ZXq0jkInd9P/OULr4MXG+r0wKddPOk2P34iiqEYULzrbRfodNCYG37j/4KtAlk3gOamwrxSiAYzorIcRdsxGAWSPixNLael6qmTylmxKsDgK/2l2Z5o2wiL+/CakIRBt2JdvsrHKl3xWgi4gcR3DINN0R005P/LZ/CryKfyTZI+WngJ5tXRoeZVU1dENtH2unPD802l+aLYY0EdjC9K13EygUz5uTUPsVrmyPcc5yRpZAvWvjRloKKGXDiMD6jBM=; 5:a+7QbmkQwim39mBMh3qg5yRtvoRlzE7xLVfwZsStgYrN3xHfN2vzYbc4WMUqGDip01y6M6A7c4Rt8Prnbbk+LwNnN5umy9mpmZglCYtOdc1KFgiBDgGTsfkAoVuguT4DgaR/urne4wlr5P4/oigGfMts6i1Q9XOLJEMRKvU2Alw=; 24:RPGNq8tiAh9yigJ7MZ+Ie5dybrQH9B0CisLoIH/KYEOb5IZcyPmA4nqAnFfHfs8h4bmwFQ8zTx7acf827dBTxAK43KEAvQXdHIKd8wNDFL8=; 7:E/Ni/3frA41C0wWLEhkMBRj+apKLccERdy3DGdgaFNqmuJROQ8V7rsAxDlJmcH/0WT4xRAVSiizAyxLLbA1ABEhrfyHm1gr4NqNu/Xrf8EP54kVOpFTDaBqkt2x/D1n/aYF4krTRyo1dUnBYQ0bym5axUDxnVsLyvvWPQeAct9WrijNjkH2N539QMJk1Mz5LrKBzZ+z1CovQOLvBJw7wov/3ljOWhXqjwmyfeB4pEoM56pHZ+2zHbpv4Yu2ucAZV SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2018 02:50:45.2584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81f8d0d0-736f-462d-126d-08d5531df3f1 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2365 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes in probe error path: - Restore dev_id before failed_ioremap path. Fixes: ("net: fec: restore dev_id in the cases of probe error") - Call of_node_put(phy_node) before failed_phy path. Fixes: ("net: fec: Support phys probed from devicetree and fixed-link") Signed-off-by: Fugang Duan --- drivers/net/ethernet/freescale/fec_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index feed383..90aa69a 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3576,11 +3576,11 @@ static int fec_enet_get_irq_cnt(struct platform_device *pdev) failed_clk: if (of_phy_is_fixed_link(np)) of_phy_deregister_fixed_link(np); -failed_phy: of_node_put(phy_node); +failed_phy: + dev_id--; failed_ioremap: free_netdev(ndev); - dev_id--; return ret; }