From patchwork Wed Jan 4 11:21:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 710893 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ttpM40vMgz9sxS for ; Wed, 4 Jan 2017 22:22:40 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3ttpM36mJczDqN4 for ; Wed, 4 Jan 2017 22:22:39 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0044.outbound.protection.outlook.com [104.47.41.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3ttpKw6RP9zDqGS for ; Wed, 4 Jan 2017 22:21:40 +1100 (AEDT) Received: from CY1PR03CA0020.namprd03.prod.outlook.com (10.174.128.30) by CY1PR0301MB0745.namprd03.prod.outlook.com (10.160.159.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10; Wed, 4 Jan 2017 11:21:35 +0000 Received: from BN1BFFO11FD017.protection.gbl (2a01:111:f400:7c10::1:101) by CY1PR03CA0020.outlook.office365.com (2603:10b6:600::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.829.7 via Frontend Transport; Wed, 4 Jan 2017 11:21:35 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD017.mail.protection.outlook.com (10.58.144.80) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.803.8 via Frontend Transport; Wed, 4 Jan 2017 11:21:35 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v04BLV1Q022990; Wed, 4 Jan 2017 04:21:33 -0700 From: Madalin Bucur To: Subject: [PATCH 1/2] dpaa_eth: cleanup after init_phy() failure Date: Wed, 4 Jan 2017 13:21:29 +0200 Message-ID: <1483528890-8621-2-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1483528890-8621-1-git-send-email-madalin.bucur@nxp.com> References: <1483528890-8621-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131280024954931334; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39410400002)(39400400002)(39850400002)(39840400002)(39860400002)(39380400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(2950100002)(3450700001)(47776003)(626004)(5660300001)(68736007)(54906002)(43066003)(69596002)(38730400001)(50986999)(189998001)(76176999)(97736004)(77096006)(2906002)(305945005)(105606002)(48376002)(81156014)(8676002)(356003)(4326007)(33646002)(104016004)(2351001)(86362001)(6666003)(110136003)(106466001)(6916009)(5003940100001)(50226002)(36756003)(85426001)(50466002)(81166006)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0745; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD017; 1:FQ3zmnmIvPevUzhss0KnWYPVKl6o+JAAipRf+3f0cwek0oX9G7UcmOWE6udgsyUvcH8Tb0F21qPrNw4lcfHco5FuY/lPiZMNcwQTYSKYMaKiWEPkiC994YAlI1BD4BbNigkLeR2csOGGwePpAxjv8Wr4YUkCEyYnVXQWTdJsx0B3VmoW3E11ivKZ8H/UmhcAo1UgiSC1m8WUm6ygN1zPZjjY9w0IoExC7Mca+Kifcj++vc8PvWG+n1jtS3coOrdSqwRYzEBvkIexJIRemPtJrK4YocmswAhDlHbVKvfptURQFNUd3TzH89akVsG+zZjYY1l6MH/gXqSwBCv7u2xp6Tt1b+IFZy8SxT9ONR/VaWabZAwHHMCkjn49H5KnJ5kYQ7oIj3zO6y0IYtW0W4pqMvIb+LottIvqgjdAmrkzu11t9tWDrQM/FFb2Hfqc7udJUz31dFvgdR1sGhdfb2gIXbzjSTt0sX5wptL/Fx3HoVSSKSDveMnzqtxOTwpYwPY/Hjz2ylk+3HMTIRW/c4hZHkeOQt9UWKBPLkgwarzNUdya7dsuWr327hKwY0w50b1K79zyxQX9g5LDk0+08p3Sl5moVa/LrSqMU5H2e+4s2B0= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f38b4b7e-67d2-4922-a72b-08d43493d7ff X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0745; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745; 3:NZyTakZ0RCDqO0AADChh4xwAG+zbbH5MmjMEREdGuZ2jU0Zysj+Cw8NCDGjBwUqeaBNGoZX5joz0CYdv0AQMOFiNTk0U6fcT5mZ7u1OqPTtnPLZOPC/pIyanfJ5mCMuMWDzyqsUwMdBfZHRBkvMqkP/37cNtGeESOGeCQ+DB4sTSfReG4Q9J6LbNRRK868N4LtwmRCVm2BMExfyz19DiJlJySN2vGkzNhnGZtiGdqklylT4SHA5vFFFj7nJiAzn7u7l0GBwLOh2RFrjwrDUcK7lh43vbyOsC2QMJY47f5Ovbgmv7NHXFKNJYlcH0ZlRdgRi1j7/XW7K00hG+Q5uDrV38gJ3qb6U3XsfRE5Q5k6jiRuDhrMUQghLcIttAAyu1 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745; 25:DmxlbKK5jf3FI2wXqjC4W9q6AMpLkEUW64JLzgWjo9FbaYXxZR5q/Zojdy7Ca0LLqWgDiDSau2hoBC4lrZQFN4EQ6iHgRfQHKyowl3gd00SPXHRKTgn1Q3beuVmBcrfS8jDu5tsGsFsWh5GH1Q7m+UmsXmk7Dr9D8KbTjvCtMCiXXiFVyCFY0tNeZqCoOon/p6OKctzKrTIMZr/18OairuTCmoIE/emb3f/ViatOBhFIXZK+etchK0jAcuswTV64MM16MVnCLV1Ozee9hujvKrzGJ6a33sgRxgQMZU58ZFxHKHi4JIVWow84m4rBbmTPdmaSqZbVird9NSRIrYPHZseynQ90VJ8sCBhlm2P3ESDCWXpaXMFEQcwnBDzswLRpGfVJzWH+CyhkS0ZqhsktkvcBm8VcGrpoGc7rRtL7VitfUVtRMUB1H6GFEwoUiOJ1iU/BPt9Jw87FNowgcOqScnZ7+gxDRIcgU6H6zDtBy3u7kU/tdIrd4FivLAvrgRH6QzTS+dNvpVXkWd4HZDY/91xmlMyTt/nYXvUiJq8Rx6835ikcTJMt3i92GAVuaL60wE1rUKuvG0iLrq4whEMOOhvfAcM7tZDZyXG7aBkKaX8R/x14x7BH+F1/7C/gEwcsPH9qY8tIMPcLNKQHkYx390IxqyxVPqrNvnC53F8x86K5BFT9McvAhTJT6pyFmaETLqtaC880oBRWAbWVFpEgkBAajxn8kh/qaCnjzWaHFmRwkjCTLqec//j5tnJUulFWe+WMPfHa9ZFcH78/YIVdUTaSLC/u9QA+IHyMU1r9XZc= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745; 31:YeInL9HXPQ9fn/96xCJCriAIeP8AnwzjBnIuFye4j51BJd8X5zozTxjRaQEvWy4B85BaIpt4MNGhaJkgHWfZiO7WDvT19DiOb3FpejD9XBjdKU0+IlfF2+MLkjaddf3oueiLJtKYxsJ7NqWgMz3iB+Bv+hN57O2WL7mqPgcmJaxLxQ7ZjJiJJ8r7746wlNOyVykUkqwlg1RQXbwPuwf+NSg9VsOd4dn24vGei+GOdU20GNlU76TXA7iJpmXbWp52oJDvGh4yVAaBZnnyGj5rA0+jo0Z2mosipdegfI5csBupFFlFQaxDNRcz6emL2txu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123563025)(20161123565025); SRVR:CY1PR0301MB0745; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0745; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745; 4:oOjFK9bpm/CO2Up0HfSyugw2IS0QaMVXxooChDwnbQ37CnFSdtpUHv7QThvgifDghe9iGdgW8SN9BKyvzgEaovuBu4DLpyZrly0D8NButiasVDYi4dr+DJrDtzA+QiYUmoP5+kFNgtaCVgzDbPSCzsEri5T6BFPH8dEuLZpyYSNe3hu1O9UyWl3siZfISatfnILjSKtP+4+0OjCcm0dtuGIcmBleMMXBG6t+s+AHDAWB+YKVeU16dOzwn7IrWwewry5KxyQzgOBNTumfORnzaEWaxvf3Wk/Ta3dIujx8NvQMhYqjxMtGnBFajeI8eo32S021RQXBM8VCz0osY+K3+LMAHre+O51yH2VQe5VJZiJ/4pxB/gYLOa4Z1z0K4iQEPLpOKLMXI/vK2SAt/3TznIL7C92L2azOprl6H6kbsKkvMbnRIFUYrBWQ4gYDzv8f7UQj+HAnEHR6jQAm2pmfwFTz5o2/AtvBKUxr9XGPu3Eeoa/Rrm0w+SNdSdBjVdf4X+rSaF/A1yunTmM086+cjjb6opVTrlQqWcs4s3z9P8zcFVfI+Y1Vcxl0yPHmD+PKelce9kEkODuWa0+UpdvSouk7i+GXlIu1jpTGEeLekNpMMwWL6Jr1qUyizqjxQzSOfvOF4N98aQVp2YFnBD8KDKhdtHCjuuPLaR+uJYPSz3SXyYXd8uzz3dKulg6oiFMPDXnXsiIogPCLEvpamyaW22kzHfa3swr4BfuwIOgi2pbBGjJvOLnQgYr2jl7pi/aF X-Forefront-PRVS: 0177904E6B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0745; 23:TF9n0779QE/ok+ABlFwHcHnTMqkN5GpDdhK4pT6?= =?us-ascii?Q?z8TkeLqgj5UeVJDWUkp70mB2NwDvGvomURe9FBQU2Wql1GUC2tTYytZ2FJVb?= =?us-ascii?Q?BTBtz18PVRSkl5O3qbvM0w6QBnVJN1LzPISv2dbCUFY++lrQwsrP2PnArtEn?= =?us-ascii?Q?rzHGqZUYdMdGhktc7rnvtxdJzwU2A6Z/nFVKFdUEHREy8kTRaqhm0uoCtkb/?= =?us-ascii?Q?pWowCrAzBT7UqhPQtdf2Cg4ZBlZ9xHC1ctyJFd5HbhXgkdXr2s8O/D0Yr1Mn?= =?us-ascii?Q?e+oruHCVaHyFl3RWsw0kAVn+pL/NiEzxYPHKGZkCnvWQmrqRw/skiWHFvTYu?= =?us-ascii?Q?+Ffg59ZLmUFVbWwZpBRvMv8t/KNkb8uMTL7df39cbbq7evm68UPhXsYvWzRG?= =?us-ascii?Q?Rg+27CmPjAocUvufxXCO1n+jVrWxCXbMFXIEXOJxhSTYIsU/AEP2gRu3i+r0?= =?us-ascii?Q?tiUbX5uQoTLJ8xkHv0FA8Cq0Dzio7wYpP57xG6sdLA/BBUg58rJGkeo0zFEg?= =?us-ascii?Q?dd2gQ90cSBLMALKOb5XCpv5+WrBKzTnYv8JyalmqNz4vWMhGq3grA1rs5xmh?= =?us-ascii?Q?RmSq7KP7DVURkqjrGl+Qz5E0gszXLQfkKk2VwAoyXlsq+tMuDJQb/UMzrEdn?= =?us-ascii?Q?nPbW2WHO9n+1ZEoW8O/psKm9fyETvLVrtuf2sEb3zhLlb45RH0MIE66Z7JBV?= =?us-ascii?Q?1q41haGHc2FEjiYTpyklSyTWJuCUgaF/cn8QqtMjRrhz/CtWJJrlpKGUQQum?= =?us-ascii?Q?S1ZMLmFwsDCx1HIlKPMO45BylOVYBryEB61sKExqPsnFF3GKZ+PbAtEPYV85?= =?us-ascii?Q?yvSCmvOHaBmJe16mwGvTahLyO/CLSjkUqpCDMudOYS1IMb73jKe4s/jmBEsc?= =?us-ascii?Q?XaghNI4FaHRhrRITk0diJUYciFD4BdV7E9gxZlm9BiBXR7JGWeIIGy5HFR2w?= =?us-ascii?Q?P4Ws6EbGFAAKsCZzy7ZykY9y0vcIdTU8L7pO3mZESKGPiS8nIr8yLoqJvkrs?= =?us-ascii?Q?hjEdl6su0pXG4cw0OJk502NeOXvI6vywJPB6yNRn3eN2Bq3xlVv4GGY+vNxE?= =?us-ascii?Q?vowbrgRq3pc1qu7B+V0FxJZTWsNsS5vMNnhzJ2+7U2G2pkRVg1Wg0+npQZgv?= =?us-ascii?Q?B6+hXgD5aWL3lEDSVfYOtkWkUI5ElG7G0PZ2UzF1UY3/V9/6cTh3VM5DuzdK?= =?us-ascii?Q?3+xSBjb0JCz9VwD9u2IfVlTQoYczm43bsGdT6FqUC8GsJX7RwHaniMJHrzO+?= =?us-ascii?Q?0CI4M3HNrHSffMJnT7t+OKQv8puzMJcZWAah1GbCSD11M0yxzv0cf3vw0kkq?= =?us-ascii?Q?2UfN5f39HY3kR7qoCjd6eQgI=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745; 6:PKWIhQisoRhSlqsSMJHkmWmVf/cUzNpLgFCLo9PUS9w2fnUWuHRkniAWrhxSqleQSqmrsGWGFAYw6auIQvUx+hgH96vZ7Y/o+b4CFQrDY3ZfMREpyprgeyi16maCaOBWBQXfJymrzrXQRXmNbIxgPkC5qqMBw1kpHUa1NYUoDFgfJuMhJUr4QS9eTmbruMyj48yWDd6ASu0mlXhKwKebGPdW03lnJ/FQ/PNV5/1xfGTlegFZx2nWmYfRWEdZK/mSvAqGsfigNVwNKDAjwEJjBX97LrCRUjEkJc+gDRA+ihC7DjIxF3Odw9kyLqdSybzbW8VEPxFGo1tJxKOIweQOeBHMqNN+lvp08gtohbHm62NLeeHYGaT0r7T2HJqYXWRTAW5MwFpR0zU0ZsL4ICNcQTh/c7QcTb/VF+XmTjYLbvUiovmBqefZnTRxbE57chNA; 5:4Ab/uYXEM27QB351KwsRi42rnRUQh4EFjhzrIWLjpkHLpU2gnl6oAuroW/L4E5Qr5GRSOoDogronh6uAXjL/sMg70fX8Su1UImdjzaKGp7pX2VP/OiWMNQ/JmRfkkXxPQyOhggtibw8ufg3uBjhXsRpeuWilQS+f8x6DhS5CEkBd03c1IkOqFjqRQ7Tq7YrM; 24:xMk2lHvEPeYeSuC1hVGSmiLjXLm5CIg229f0UtEGk4eYI6kJ7Dtb3G86CInfsw6HjrIPdUA6P2w4Lnnm9gqydPpCiJlKI9npYDTJK6K7/sA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0745; 7:kwcjeskVBzq8IylXZECfHTbsYzXNOBaDQRKIaZW9jmYx9WObk5ESSCb8TwXTWkb1Yp4+hqEsFnYA98de/Lg6hyMAVgSjO4sk8V4+hlynyz6bTrjlEnrBRqjvrLCK3Awgv2cbn9U2rk7FUMzOz963maL9FWeXrTme+Q8gD9aQAQAVWGJp0BzvA1UtfBaxLAGve5KJkjolb701gchSpjmCsHs2WQ2MgbjkQ3tcHqeS8SbOTNXLkPFehTtnuUuDDxT/elJclhugZKEAnKiR1zGaBu+qIOHRqts4uDNIBgWmHvaX4UeFyD2hmaDRUgxGHtY/LT/YNWD4SnFq0SyPf1vDpWu3GPfqWmjZMMxKpLIzuvVjfU1MqUZ5oBo3Hvg8b/EchZVOJKiG+L1yBS7bEOWQCRHZgKRVvB+IrQUBZjV8TXirzxDMp0I1dvCuCYmXoKVqDX7jiKUFp9W5CTXLMLo9YQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2017 11:21:35.1967 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0745 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: madalin.bucur@nxp.com Cc: linuxppc-dev@lists.ozlabs.org, davem@davemloft.net, linux-kernel@vger.kernel.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Madalin Bucur --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c index 624ba90..77517aa 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -2291,7 +2291,8 @@ static int dpaa_open(struct net_device *net_dev) net_dev->phydev = mac_dev->init_phy(net_dev, priv->mac_dev); if (!net_dev->phydev) { netif_err(priv, ifup, net_dev, "init_phy() failed\n"); - return -ENODEV; + err = -ENODEV; + goto phy_init_failed; } for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) { @@ -2314,6 +2315,7 @@ static int dpaa_open(struct net_device *net_dev) for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) fman_port_disable(mac_dev->port[i]); +phy_init_failed: dpaa_eth_napi_disable(priv); return err;