From patchwork Thu Jul 10 04:48:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 368457 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 49925140142 for ; Thu, 10 Jul 2014 14:49:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751236AbaGJEtq (ORCPT ); Thu, 10 Jul 2014 00:49:46 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:52566 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751186AbaGJEto (ORCPT ); Thu, 10 Jul 2014 00:49:44 -0400 Received: by mail-pa0-f53.google.com with SMTP id ey11so10425475pad.12 for ; Wed, 09 Jul 2014 21:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G9pm23BlZNIzuk0CC+GBkpvXHwCDmoUp2vNstiBKcp4=; b=GxSLJBTNEB7uM8aNUY440x8l/8d5nwJu58S672qyStk+CRpfSoj4oNnb4zhZyDmp8t p0HjY80thag0uIMJlIvIjOG+vDcu+yfYv9owqTUiN+0BRzj+BriTZZDlEkLw0e4WQgmB CHckZbbZMpFzgkzYYXatujhfQgwn0U9mUkif6EoulqSKv/rHyPOeO/zSMxzN0PK/WMfh XivhwFAPK3txh4vCdFQ284ENUzYHXzLAtwcQUPq50peGBLWWW5psZ8XUiXXZBEUjAL+y D0HZphIzVfahCJKvYnaXzVxQhjBVB1970EYv1roDPJ40OzTGfkuls8e0JJp5htK0MJTX gUjA== X-Received: by 10.70.129.81 with SMTP id nu17mr11280697pdb.56.1404967783982; Wed, 09 Jul 2014 21:49:43 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id fx14sm30708487pdb.4.2014.07.09.21.49.41 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 21:49:43 -0700 (PDT) From: varkabhadram@gmail.com To: netdev@vger.kernel.org Cc: mugunthanvnm@ti.com, linux@rainbow-software.org, balbi@ti.com, george.cherian@ti.com, davem@davemloft.net, Varka Bhadram Subject: [PATCH net 7/7] net: cpamc: fix in releasing resources Date: Thu, 10 Jul 2014 10:18:00 +0530 Message-Id: <1404967680-13206-8-git-send-email-varkabhadram@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404967680-13206-1-git-send-email-varkabhadram@gmail.com> References: <1404967680-13206-1-git-send-email-varkabhadram@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Varka Bhadram before registering the the net device this code freeing net device by using the label 'fail' fixed by introducing an another label 'out' Signed-off-by: Varka Bhadram --- drivers/net/ethernet/ti/cpmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c index b6efe3e..b68c5b5 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c @@ -1142,7 +1142,7 @@ static int cpmac_probe(struct platform_device *pdev) mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); if (!mem) { rc = -ENODEV; - goto fail; + goto out; } dev->irq = platform_get_irq_byname(pdev, "irq"); @@ -1170,7 +1170,7 @@ static int cpmac_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Could not attach to PHY\n"); rc = PTR_ERR(priv->phy); - goto fail; + goto out; } rc = register_netdev(dev); @@ -1189,6 +1189,7 @@ static int cpmac_probe(struct platform_device *pdev) fail: free_netdev(dev); +out: return rc; }