Message ID | 894f21bfee34a1e15c462efb56ccf323cbd1c504.1487618263.git.pavel.belous@aquantia.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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 3vRv6y5bVfz9s72 for <patchwork-incoming@ozlabs.org>; Tue, 21 Feb 2017 06:38:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=AQUANTIA1COM.onmicrosoft.com header.i=@AQUANTIA1COM.onmicrosoft.com header.b="Ww7NhoK3"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752263AbdBTTiA (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Mon, 20 Feb 2017 14:38:00 -0500 Received: from mail-bl2nam02on0068.outbound.protection.outlook.com ([104.47.38.68]:52795 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751478AbdBTTh6 (ORCPT <rfc822;netdev@vger.kernel.org>); Mon, 20 Feb 2017 14:37:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=AQUANTIA1COM.onmicrosoft.com; s=selector1-aquantia-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1j6st99h2E+CPvPWlvWLEJkN9PN4cic6u8kTPwHGjys=; b=Ww7NhoK330Spj1fcLtqIZqBMUuoguaVXw9yDwY3iv421GosvDoYRQ2hu/OPTMr4B0xR/YPrKVrcY08gMyXsu0nej9UnafiTvXjmIrJlAauQF/nSFNesLRWYjcnMASVW9LCKUTX2KfwuVSoLfc/P9GEzMzvlaoAiUu2GimPOSqng= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavel.Belous@aquantia.com; Received: from atltest07.rdc.aquantia.com (83.149.43.106) by BY2PR07MB2294.namprd07.prod.outlook.com (10.166.114.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Mon, 20 Feb 2017 19:37:43 +0000 From: Pavel Belous <Pavel.Belous@aquantia.com> To: "David S . Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org, Simon Edelhaus <Simon.Edelhaus@aquantia.com>, Alexey Andriyanov <Alexey.Andriyanov@aquantia.com>, Lino Sanfilippo <LinoSanfilippo@gmx.de>, Pavel Belous <pavel.belous@aquantia.com> Subject: [PATCH net-next v4 06/12] net: ethernet: aquantia: Fixed missing rtnl_unlock. Date: Mon, 20 Feb 2017 22:36:44 +0300 Message-Id: <894f21bfee34a1e15c462efb56ccf323cbd1c504.1487618263.git.pavel.belous@aquantia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <cover.1487618263.git.pavel.belous@aquantia.com> References: <cover.1487618263.git.pavel.belous@aquantia.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [83.149.43.106] X-ClientProxiedBy: VI1PR0901CA0074.eurprd09.prod.outlook.com (10.167.203.170) To BY2PR07MB2294.namprd07.prod.outlook.com (10.166.114.26) X-MS-Office365-Filtering-Correlation-Id: 1813a832-362d-4032-b500-08d459c7f1e0 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:BY2PR07MB2294; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 3:yPNo9qDw/s/OG4S+4GumJi7ps1gckwVld4cX0wytaXBJqzUxqJ+XeVxhXkJvipl9pZlVpyYEafDAaeaOiHMv4xvIhsa6lF93kt3rq6thSIuS8tjO5/idpKLMyWLznsNnitT1+/sQ/r7xPPWNUfG5WnZUaYv7xnT3D8Hq+WbgLQinPmqRZJU3lncFviGT+QOVMs6R8OCeZpQs0QwYWMb5JPhNdJ+U4HWYIYJ8ZlAJtwdJl4IJF6d55Nq+Qo51laYhx8F3CJiHQn1cD2KEwAXWuQ==; 25:N9qqHm848YFqxRAUgEQXs2ZtGO96/+INUwAkRrhlbEbGtl8IAx9HHjsqlQI8SXwtaYLR8q6/Hfm4/9dCegD4V9S2JVnEZfWGQaFw+cG6DEDRirpfIT+MTl5/6Fmq8VMla2pe180ZVvYqK9HrQu12GXkLe5wpGLPP7F2Tcv8S2t/bjk4fQlGnB+ugnMH8lZQ1oYveuYf5eEiAlQY53/KZNdNXCDZxYQXbRIyYONOS3rs5wK/krOAE0rVFr1XhMNOTpBBOSTUCQhbYheKu77wh6L5kHu6YJbgbIVDYchQYjw2OT9Pdtt4YkHYhQjWl5haDNYINBKMsric6IsbWIeatWYLAkjoDqmwuAFx3onG8zp8uil3IxUSerSXMMhgb90e8v/4/0OdFAnssog1sVsSBqhpFRBy3o6ptMn4gLwQidsxkvSP+TO3/dMteCOkrWxwZd5+KZWf3RCMePTNSGeRxOQ== X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 31:11HlKyThPCPBq2kqPPYW15tVPUIYtR32DTRNVCwZi0YFxNV38ZYdt0HEZQYhS80bSTew24BXLylZhEOUOdOGKAzGR/jbfIFNxN+pzGXk1LZ4+Z4S9d+yopdCkNexs3m+E4bKDwtoHDyclOPrXzTPgFGnM1XdkcrfhC2dkXKI/L9pzAYLtCdDcKBBRLRHJLJu0eCkbiD5EeyGvsuCo3p4IziO/QhXyjBJHIDoxc3C72k=; 20:wg/Q4NSTVQYYPyDxsW+QOfGCCL4/OO0hgFadwF+QyYwZasYRLLVAUpQUErFok2AowecPTJqiPQoBwM1HYJbtWNbIG2ZNKpTL5gBVjvIEp4SIY7casU0Srvri0tOYKCTXrIsCzygwYvhEDMJw6+rUu/1npy4oH86O0y0XJoB8JerO7ptG1YuognQOfPQvAoLxCtQ/ZrIBFEPv42MdN6dv4pdKaQlejNAglPnpNLrqKw0nTKLvi4ffiSchZuxDOVnIBcSmda0bh38pDSsfmn+ZBxnnfYLNBkXi9bPg/i2oavQUrEi2X2u5tjizxP0aZpW2b1Zc17BvB7ljDuX6DstsQbaLntMaQpxcIxY7/6qn6GKlGjMksKQ8MYh/WQ/R3GceHUmVy876ea5Z+VljKKAjG5GrsC+zxhc40ZDg6fZjvrk0sxxQx3vYb/IXzvDcJgu4JXnP39OY/108XMq+Pkqlcv+wcbMwkAF6AXEGjlgY6tHvZxOY05w922yMkhdc0LR2 X-Microsoft-Antispam-PRVS: <BY2PR07MB2294ADBD7F9EB97F9E1EAA56E15E0@BY2PR07MB2294.namprd07.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(26323138287068); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(20161123558025)(6072148); SRVR:BY2PR07MB2294; BCL:0; PCL:0; RULEID:; SRVR:BY2PR07MB2294; X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 4:eE35wQJf0Pm8KG2jY5WDOzjh7nojSwWt9jj2WOUFs/POfeF1/viEzbE5cV0WvGZuSt5qOHd5/d5PbPB5cYb2iT0jyx1l9CkZkDK86uWaOAQvGMuiRR5v2jujWMJJoUDPO8yT5jXYKcbjAD6IO4uibUbs0ZvUFIodyH5l5ufNcGuCj9pUHZXfnqhKYpOZb/DPqw2V1cdnIRA2elE3aIb3dG5y54OtiYh/241wbHM7t8L4folHhHBi4YYVHgGeoAnYMUYPoYKWtrlHvOlJ75qALEoIcifCflST3oZZzNl75w99NUsjaAWQuU1ZQkvehK85dNqwXxGqo+WNvG2CJ7oAJmvs3pHYeHFeaI0s9urOSBgeh0f6NTBSbGBtd6dN4WNQyCpCHkA8AY5clC5yCS2CqWBZh35WGHGS8EOzuUrUaldsREOTZ8WMpazFfutDfLxpQmTf2jJBgHDfdksHFLSTqAnbWraK6K7AAmJEOTMBohEhdriWxeyi2tDFmj+Ig+I+e2umE5VI+o/ALU02AV5uCRXfwDVCflzx5fBpqLtZOY2nkGH9jKWMmwifm6AHwf1T6JAlK1E3QbiFNvT5q5VcbYbH2q2N/pfFUG9wQQFCy9WB5JSbB7uIpbWk2FRfi81UdyvHmNxoWfNZD9T5tiPCgA== X-Forefront-PRVS: 02243C58C6 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(7916002)(39450400003)(199003)(189002)(110136004)(38730400002)(107886003)(53936002)(81156014)(81166006)(5660300001)(101416001)(8676002)(97736004)(105586002)(76176999)(42186005)(50986999)(86362001)(118296001)(106356001)(189998001)(33646002)(36756003)(68736007)(66066001)(47776003)(6916009)(2950100002)(50226002)(50466002)(7736002)(5890100001)(92566002)(6486002)(25786008)(8666007)(6116002)(3846002)(4326007)(305945005)(5003940100001)(2906002)(48376002)(54906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR07MB2294; H:atltest07.rdc.aquantia.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: aquantia.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR07MB2294; 23:Kby/Tp5JaSg3UsayPKCjqgrkapo2GtZBFF7lDHnW1?= =?us-ascii?Q?RGy08diEJo5aREPI9Nfln6OsqXFL/I5WytX+khWXGS6WJUmf0izssXNvElpy?= =?us-ascii?Q?5co8nl/lOBs28BwoEXhpJakmgM0jIfdpGtwgT8rL9Pk32cuhA7Lwv1EvsCfX?= =?us-ascii?Q?gmnm63WM/YS532tzVbmQBJ10f4LZzi9BgKMnxU+MQpsyl12aVdTb7i7Olv+K?= =?us-ascii?Q?TuyQ7dLnZBD9TWaZ2vb53lhCnZYvq/8o1VzJGvKUGDEZLmCJkqVnDVEzkVyV?= =?us-ascii?Q?pwe+KN3Jmw1igdegHYgNdDGhEpDYUU3WYkAcPa50Ve4hdHeIzg/AFDwFfVOC?= =?us-ascii?Q?f8JCawAAGwM2smOfj7WEq73CUObyIwg3OV6VWB9SS2AIOu56BJ1Ytn0OHGn3?= =?us-ascii?Q?gqp9NskjGQ44ccsSnvlKjx134Aa3btVdHOhYwiNGxRjZHT4j4DXha9z4clIY?= =?us-ascii?Q?vFvvv0ZOF+XrhaRbfFNJu4Mk2jXQ0uORBaZvNL3kEMA91K4VDeSqn5txbJBR?= =?us-ascii?Q?deVLJ5WCRCyem3mJ1mHXvcoew7/FsoOcrVyLsdxHTCecH0qpIFhEguUKMixN?= =?us-ascii?Q?BwEkvNp3dzelUc0V//zQganRnZY6GF2HXjLorpNLyB7RfsZcolyEhJL1CxMF?= =?us-ascii?Q?ToxekUaS/TAd8kw7Jy2drZaj+rNKOyTATMw9lwlR1m8uaffFBcTtzUhNcCtY?= =?us-ascii?Q?A/5Hb9y5tvOx9ukkANocwLMl07BtI3bS3eByWyrXUWow643C/4/teTEGkhVZ?= =?us-ascii?Q?fyv4WgJBTXU48ObE+zdQLexAEqxq/dE/XzWsHQZ1xvk6Q4u/HBsuaDYxRA0m?= =?us-ascii?Q?uwt12osPqCGb6x9TmJGz7hrslHfUx88QcjltgctnQejS9LFMjucDLNEvy0hh?= =?us-ascii?Q?wnedbXLStOkGVjfpOdKn/G5J8Zdu6uXqMRnNOX+VSxCYvOAin9yOJutPFrGk?= =?us-ascii?Q?gStBREeKkDWh2sfrGrKoU4YZk1rAguQEjW+WV8Pqamn967JRnQhBob/8hQdK?= =?us-ascii?Q?SmvpfrBxbZmwgqvmZJPQV3sdCAX3XZkoKLEG3c3yMTvFDgznrhpChA8+ewNr?= =?us-ascii?Q?zBOvNhs3dPWocR/oeBx4camQV2EPCDQWSu1/pzWoj1bcDyHbKdyRls49VLL1?= =?us-ascii?Q?lZPG/9FRXcZjUX83/2jslu3DpWA90kj?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 6:p3OI2ieFZjN1uyd27TUywlCzFE4A4fWPaAAFdXMR/YEijXoGg9cWt66dSCSbmSVGFA/dRoO7seMKm/if3YPfOLwHgy90HkPc04l+n1Hs6o4JUBVQ+4lOlZ2uEfnqBWQNeX0ZwLcjsIvjT2M7W8dxQUC53/nSzCQIB81Loo4Yxb/OY3WnUVGRkAVVh9Mz06j1SqVe7/HSi2nW1N3xoto9KcXM1AZDaHOCUJG8HZAVeUdoWR10Xkb69uFFpncUJO39HyW2Nn/10OKlfznLYmlnUOeoJVqBHCH0CVyTjJh9bQt22pkwlM6OVufNEP82w7wcgGWebO0FcDDuvBKB0yryjErIGB7CEkaB3yKLI89Dn2lmuk+9E080133vspi39Z5TfKCsU5e7apVb6NbRDGnxCw==; 5:fwk+qRAeQhzjdHBs5cd4Wuvfmy0nvoxRY3jKnW1YpdrXuE168M1t105aHvnVxCCFOc6ygBtxZCIZG9Jdfb7mHEe7dSLuslGDA3cy2ADbmWBQxZVorzC2W/hQAlYiJgoPu8u5x3lr1oONkLCm1sn6Ow==; 24:/eYRvK565grz7m8CKWtf39kFDeKarRbsReHz/vguA6dFmvNWpZhZM5Agw85bbQ9FOSqFbw3RbGaBIsskT9HSqm/su1XXMdDHTS0FlaMnePY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR07MB2294; 7:mSVZBLRuVw6VPVTpwYRieIxmqv8M1dsy2M/uijJ0ekSRMZnp6VABtbGbwSBjqOXi0s1L/EWD9rCdGNp5Tg4x2NhXoiH3m7RW4L+u6xDgWv71Fejxvj8/x+QvCR5ssd5knhbFgMkh4mpuR7oHMEL2GSPnMjJ7NvJFuarheohHecPXrcH2KSI+D0TS4GOBG94nbSVfJOPY7PYeiWUSdHtOOyuMbamMSt4UkfIPyUvmdaP930J/0aO0JQ6EHsBxbRFUKHXy9T6FsP4mKcZxeT7ICITgwI0IOWWBN7cmp55cXo0wIurYtUFpJ4E22z+mTXXwHzMQUnBaX4QwxwLaDAqF7A== X-OriginatorOrg: aquantia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2017 19:37:43.9297 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR07MB2294 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c index 4b8d074..646314c 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c @@ -932,7 +932,7 @@ int aq_nic_change_pm_state(struct aq_nic_s *self, pm_message_t *pm_msg) if (!netif_running(self->ndev)) { err = 0; - goto err_exit; + goto out; } rtnl_lock(); if (pm_msg->event & PM_EVENT_SLEEP || pm_msg->event & PM_EVENT_FREEZE) { @@ -957,8 +957,9 @@ int aq_nic_change_pm_state(struct aq_nic_s *self, pm_message_t *pm_msg) netif_device_attach(self->ndev); netif_tx_start_all_queues(self->ndev); } - rtnl_unlock(); err_exit: + rtnl_unlock(); +out: return err; }