From patchwork Wed Jan 3 02:39:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Duan X-Patchwork-Id: 854846 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 3zBFc263npz9s7c for ; Wed, 3 Jan 2018 13:43:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751140AbeACCn2 (ORCPT ); Tue, 2 Jan 2018 21:43:28 -0500 Received: from mail-sn1nam01on0054.outbound.protection.outlook.com ([104.47.32.54]:38784 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751023AbeACCnY (ORCPT ); Tue, 2 Jan 2018 21:43:24 -0500 Received: from CY4PR03CA0097.namprd03.prod.outlook.com (10.171.242.166) by DM5SPR00MB108.namprd03.prod.outlook.com (10.174.178.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Wed, 3 Jan 2018 02:43:22 +0000 Received: from BY2FFO11FD030.protection.gbl (207.46.163.243) by CY4PR03CA0097.outlook.office365.com (10.171.242.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Wed, 3 Jan 2018 02:43:22 +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 BY2FFO11FD030.mail.protection.outlook.com (10.1.14.211) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Wed, 3 Jan 2018 02:42:57 +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 w032hDdB029966; Tue, 2 Jan 2018 19:43:19 -0700 From: Fugang Duan To: , CC: , , , Subject: [PATCH v2 net, stable 1/2] net: fec: restore dev_id in the cases of probe error Date: Wed, 3 Jan 2018 10:39:29 +0800 Message-ID: <1514947170-8887-2-git-send-email-fugang.duan@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1514947170-8887-1-git-send-email-fugang.duan@nxp.com> References: <1514947170-8887-1-git-send-email-fugang.duan@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131594209775337484; (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)(7966004)(396003)(39380400002)(39860400002)(346002)(376002)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(4326008)(105606002)(356003)(8676002)(6666003)(8936002)(305945005)(50226002)(8656006)(104016004)(81166006)(81156014)(59450400001)(2906002)(36756003)(97736004)(39060400002)(86362001)(5660300001)(85426001)(106466001)(2950100002)(47776003)(51416003)(498600001)(16586007)(316002)(76176011)(50466002)(110136005)(48376002)(54906003)(68736007)(77096006)(53936002)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5SPR00MB108; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD030; 1:BiDYIM2QsEKef1tsgSBnlJVxsP8VkMjWDzMtxfKd8N1tCjL4m5/6fFttRBroDwhTLQF7TnmnUUI6eslnOjMbKmQ0jXdOnaPtx2D2jj3u2pEWP13aPmoCCbY67L7+KERq MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e1a2b0ff-b1c1-4fc4-400c-08d55253b29f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:DM5SPR00MB108; X-Microsoft-Exchange-Diagnostics: 1; DM5SPR00MB108; 3:1PyKUXLjAoPPFMBNaGxwbbcLjEJuret6WBvldlngjoWT1qFQxF2OLR5H1Fsk+s9nayGnpYg1aXXhp9G889Yq1dHIiVE/SXCWX6sA/RrKAivZGUX2viw9Fo59jEz5nl1S17XJ4FxA0ghQgeDomMU7F6EsYKITZwaPmLKaWfL9Ew9eUkaoXCpiquayeq8d8TTot0fz4Ko89s4jcr9oKyn9c3T5JnStrfHdfMCWnspoyG+pU/FvxPIVKPQgKhk2BBXhEnQN/0yWVs6Mbj2It3ervxDjJyPslvzAdCcZ6xvC0zdD0HYJQcd16WvD7ThYoitENLjb5srm4/mkURyR3rLTo18oOgiQPjvN9vBcxfJGT8U=; 25:4HSNgEqFeG4ST20qMzvT3CTy+5t+YAWEAUFv0S+Nm3y+lBER5VWQI52yl4+Zw0+LC+icZb863SjF7jdGql4lAJvsPzqApihfKzmUtnSLL2O1iVaxaNn+SqMpUkiD5Gvl15ECCr1oj+baPIvQf4Cov1WzKgwvMSB2jWBy26E+YR51xdERnyGwnn2hqxQ15wNMDeh1+uEO72zKOiBpmyMeNHUI1gKcdC2SA7uDqeiZ/dbVplQEdNgPE06viO2+ff44jluwDzVBsy1Gl1wGXWwckBdbpwX30ZhTGhkk55ydcab+gwFFvL0mLXn8SEPASg4zKX2ltV08qQF9gnegGpFdEg== X-MS-TrafficTypeDiagnostic: DM5SPR00MB108: X-Microsoft-Exchange-Diagnostics: 1; DM5SPR00MB108; 31:At1EPHg7e1B0oi73/HoBGpTHtz0Stnria9nX8Q0F5oi9MmYVhIcpuVOgA5ls6hmtt364GrwHDJH6k3FpyN4qN8BMbyIHAmD7qUT7x1HtLsIqdpY25sTyh6aRxyXp1YbBKPYnZXw9MgBWLcLXuLZQBNNFAk2gVMtkwCaFXvUOIOmrpZcQOo0iBeTfBRVPGx1NduXnWzeQ4ow3JbcKy0eXLWe4DSNbC8YO4LmD84TSsKM=; 4:wvar9KVsAuHadw+3tejD0J+4t6ISsW1OAdjvU+CDK5sUi1IIaMLUoQdN858LKuJg4b8MCOJCu1VDWqnw2bjjpEWDy+SV/ZlVP4ToBrDqhJAoM3nSlzrCrmVJeWaKkXcrtOmUyqptTVHwUm6cRgThdsDrw9MdReGncF821tYJvZp1ZH2iW/HkZQDPvzxpKuVx0ItOPFhCkjmQxmZ7RvkNv+lk5chhiaP1lrZ/b5VH+0MyE/ON5MWzTQKAfR9r3o0019OXtDiniIeGYrVrmZbLicarD0qghU39Bb2pOoCWBU8vxFnr3CJAsS+K2odOA5qH 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)(3231023)(944510075)(944921075)(946801075)(946901075)(93006095)(93001095)(3002001)(10201501046)(6055026)(6096035)(20161123556025)(20161123559100)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123561025)(20161123565025)(20161123563025)(201708071742011); SRVR:DM5SPR00MB108; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:DM5SPR00MB108; X-Forefront-PRVS: 0541031FF6 X-Microsoft-Exchange-Diagnostics: 1; DM5SPR00MB108; 23:YiOnmX3BDWMqjEAfTVt1I87K0EPmBBgFtMrZFhYiKZlPze0U2E9qqCPsaWdHr7cmr1rs3NW+pJ3FkDQy48h+5k3JtPUy7qhoBk9/tY/H8BAIDVm7+grLHb+CUk1zMMTXtfFy95NR2NxGHX2FvPzSEz9SmEaqOdtGKxW1G65oWywa2pQn1FGRa6PpMSPKH6AMOsZc+MKGx16azJM1k7EK87xrhqkfDWeQ0fQ0KxwN5PmmHhSeaYt6VeA+snjck/yP5NS0uwabN1Nx04oQP0FUUpH7ObEP+iMmulQPYSKDNKDPNm222lK6DE9UALSf4Pb/HIFTB+sw9kGaDfs1hh6pSi4TmVmipmVVb3u8IokD6Ekj3D69Lqbi34RzlRuSyZToO2BOfMKcMxGZev/ckjZ4jcv+f0pv6drHyOKfIryD+PUDa0TF5I9QP+EFAOTRhmmH8QrGz2k6yPqec37yc+yRPSNA04cdOskdDRdbjQI440P5oxEyH4itR4JPbJ6ZhlzmRzvVKGt4nIaCil160ymxZJYT/30rhabVFcJgcq61tkAw4zg2Tr9tgFhjTaYJLPzVd8S2czCumBqiKHNZA7zFrlfv+H/M4eZzQshZc/rD7KZ5/mvk/aQrh8pfib+Vi+uD2leF12SRXV+LK9wmo8KFCJDEfsS1UbfDzGmrD4bN+9qxgZBboD0IQnluTdB5vR/S2/zO/cQXgAf1Rmizm1QKKN+4xlZUWukaFSCxC1ZYZGzdUW+HaAguf5+exsK/6ifm4lvy5PNds1njXYfhlNg5Xl6n6PnWWrbiHtVam9/B0JY+gBJ6pyVQnYAYvyyv8vThoV4PbByTFuMBjVuahb077ExCyhYBCrhvyE9I2N6JlzBTjH7YUlyW2IMuf2uy1cbzE6NFXKqNFbxlTML+txEye1buvCUiD8IqUC6yLwvyCxVA5LOMgX6OdGnJODUo8u64BJQ6HZ2QkrADGbUwV7emMnNHTrAJ/q7mb2XDRFaGwo5SuhJdDT2bHNW8P2yYI3sfI8VMw5DrhPrnf6XfUTcy21gUedmESqI6scybuNhtkyiARI9KLAqvKIyRz+w79Vm34fNOtw9v6wIbO3OARCVKjs9L4P7Ig0cVCRXY4pccpk5UfFee3z8W/WrPr51uXUak/EbMSYcRBqN0lLA3SoK6Zg== X-Microsoft-Exchange-Diagnostics: 1; DM5SPR00MB108; 6:91qSsbwQ0Zi6hoZWj0cK7X7kAC7CY2FUlElKj4EIByei+RiH+/gPUHmByZyJtuHnno9KsiTD74TesIbeZSTYjy1Y38iWXlgSUkNHHAmdX74z/ii7emnOlyqpU8t6tbbfck8ysYJLI64wnZksgyReMaDz4Am8kctZfH6uKy9NeQTXOAP9eptSEqFk57U1Ul/R6+rdaiJ10DKFC1cHC+sXvlguv6/DMJy42KSTt0hle55wzj0kR0vrS1jhQRwXSTI7B2fFNMwx60kqzJNFb9cCo02FJHJpfOnz3MoLrNvRsW0ZdMgO9n7LsSyIzxBIPCDTIMBC/aymIcTRmGlboJp0pHJ1+PgRUFW/URIHEY8QwdY=; 5:9RwdERby87Tna23bBjUkP+MGGVAbWml+tRxII1snoNvT7DaXg10v4xE3PjWaHO5/Se611ziQPp7+TNkyS8wpdUKsqtPCXOauOyq6xtmQfl6u/Jf5L3aaXBuY9ZgGl241n4dTp5RlQ1jdxIeTTQCSjCWNanqG+rsX16D+pflvuhI=; 24:5PFE4B9M98NAVC815mNRA/QjVPJ17uSo1ibTwmGDkyDLAdFyPFNKd4f2R/lB9Q+938LIMjylyfQqq2YGowZp4pGO9vSzOGQ0QGOOYoIIxXM=; 7:s8n7qeZ+OC0GctkAXQ9imLsz7Kix1VdBY71zHbCQNIBV3Stl3luKnkd2dxsTmmXNQIfqQPqwo7lTx8Wkwj+IcmRjoMsusxpuPTOtHM5QpqP4bN40NTNWggLGBguOzzxU9ihRwxrhOyoZiWs1KCDdzJiBm6pETt3NAAhl+nFqCHOPQKX/91jZjiEaKzJZ4eoz6RSv7q+4p3wBwJCQ7qVNF1/fXCjeSoEUJ5LA3vu0wIu9UGloA1KbsV7I2ok5SVLu SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2018 02:42:57.3465 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1a2b0ff-b1c1-4fc4-400c-08d55253b29f 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: DM5SPR00MB108 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The static variable dev_id always plus one before netdev registerred. It should restore the dev_id value in the cases of probe error. Signed-off-by: Fugang Duan --- drivers/net/ethernet/freescale/fec_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index e17d10b..dae89bc 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3576,6 +3576,7 @@ static int fec_enet_get_irq_cnt(struct platform_device *pdev) of_node_put(phy_node); failed_ioremap: free_netdev(ndev); + dev_id--; return ret; }