From patchwork Thu Nov 17 16:40:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 696244 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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 3tKSrh3h5Rz9t2D for ; Fri, 18 Nov 2016 04:33:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bkXkIYTA"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753187AbcKQQ6O (ORCPT ); Thu, 17 Nov 2016 11:58:14 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34978 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762AbcKQQ4t (ORCPT ); Thu, 17 Nov 2016 11:56:49 -0500 Received: by mail-wm0-f68.google.com with SMTP id a20so23079417wme.2; Thu, 17 Nov 2016 08:56:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=vQ+XGvhoehEUOMFG1E8PTcx0IfxLR2wTnuoB8aP1pNw=; b=bkXkIYTA9JX8rbVD3nw+FFYM4+7y6YP1RzW97M5JB+5WjHjTa9gV5+GAiYmYhkV+ol Kb0qqwTWYt+zZlzB6Xu1ygJ63UgdDr1X6mDzTenInWU8eRhnf2cfcDKj3nUvmB32v+sI bsx+tvsxBcts9UELc4J1Thfnc4A2d9u0CPT41xU2+BVhc+ghwv62iA9DIPhA8GhRm2u4 IC5jJdqsN2vLoygj5lv/LREdqp8gaAXdh+a7DuoAWyjj49jKZUjF/npk/RJyTOUFUcCl EVRjUlfmc1rnTeVZaOGZTe8A8zBh7LokZj9GF53zf4NUceU/KpkGS5H/4iwmTi1vTjNW Uv/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=vQ+XGvhoehEUOMFG1E8PTcx0IfxLR2wTnuoB8aP1pNw=; b=OgsdchgGARvJeRcY6z7NQwlhDTGUK/ClHBdH6uhfqAouxcQBFr8gna/7WmbV9RgX8K 6twI6E7iQXy2fWYJbItu0DuFT/6mzNQacJYKozoLWR8HOAVMcGL6bXW5Asv5IFQhl3M7 lJ9JP6EXFr9c/SJ7gjdOWI7RHRXLTBujACdoB7YoAio0G/eISj7KE74ouHyzucWlpqez ooIJw/UchNb8zAyevlr1CX0AclGwdeMg5P5pZbsUQ5M/GBM4R218KVE7ZwOiSZ7Z2UWV sf3Iw+CjGaF948cy6IluHBht3vCyIpwj+9rZGAAZIrYmQDsWEhVYUCU0g6wrFl6tIbdZ qigA== X-Gm-Message-State: ABUngve0BydxsTIkIJWXbPmeho1yp9VYPpCKw/OKpcWXq0+4pjApJtqdKCj5u0r0grXqxg== X-Received: by 10.25.234.214 with SMTP id y83mr711088lfi.153.1479400818009; Thu, 17 Nov 2016 08:40:18 -0800 (PST) Received: from xi.terra (c-04aadb54.07-184-6d6c6d4.cust.bredbandsbolaget.se. [84.219.170.4]) by smtp.gmail.com with ESMTPSA id t126sm978884lff.26.2016.11.17.08.40.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 08:40:16 -0800 (PST) Received: from johan by xi.terra with local (Exim 4.87) (envelope-from ) id 1c7PjU-0002Zz-Ko; Thu, 17 Nov 2016 17:40:16 +0100 From: Johan Hovold To: Mugunthan V N Cc: Grygorii Strashko , linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH net v2 5/7] net: ethernet: ti: cpsw: fix secondary-emac probe error path Date: Thu, 17 Nov 2016 17:40:02 +0100 Message-Id: <1479400804-9847-6-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1479400804-9847-1-git-send-email-johan@kernel.org> References: <1479400804-9847-1-git-send-email-johan@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Make sure to deregister the primary device in case the secondary emac fails to probe. kernel BUG at /home/johan/work/omicron/src/linux/net/core/dev.c:7743! ... [] (free_netdev) from [] (cpsw_probe+0x9cc/0xe50) [] (cpsw_probe) from [] (platform_drv_probe+0x5c/0xc0) Fixes: d9ba8f9e6298 ("driver: net: ethernet: cpsw: dual emac interface implementation") Signed-off-by: Johan Hovold --- drivers/net/ethernet/ti/cpsw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index c3b78bc4fe58..11b2daef3158 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2852,7 +2852,7 @@ static int cpsw_probe(struct platform_device *pdev) ret = cpsw_probe_dual_emac(priv); if (ret) { cpsw_err(priv, probe, "error probe slave 2 emac interface\n"); - goto clean_ale_ret; + goto clean_unregister_netdev_ret; } } @@ -2860,6 +2860,8 @@ static int cpsw_probe(struct platform_device *pdev) return 0; +clean_unregister_netdev_ret: + unregister_netdev(ndev); clean_ale_ret: cpsw_ale_destroy(cpsw->ale); clean_dma_ret: