From patchwork Thu Jul 10 05:35:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varka Bhadram X-Patchwork-Id: 368468 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 79B77140127 for ; Thu, 10 Jul 2014 15:37:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751495AbaGJFh3 (ORCPT ); Thu, 10 Jul 2014 01:37:29 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:48543 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751409AbaGJFh0 (ORCPT ); Thu, 10 Jul 2014 01:37:26 -0400 Received: by mail-pd0-f169.google.com with SMTP id ft15so3427038pdb.14 for ; Wed, 09 Jul 2014 22:37:25 -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=jAhFGLW5N+hhEWt/pu23HYj4bVPGN1h8vyx39+UUM68Pduvp+49EGNtx/QMuKNzBHo 3lx2bJDPA2S1QOwpUz4DIljFhvOuMBTCpqLGbSFIgjmBy0SiO/jNO4PV/KVWmM1HaDSw /G9MTIgUJPVli0oUZURUib8bZgoqyiGxIK2QSahdfC/v3v6QXj5iHVhOA75TDzg7m+2U B1P9Y5JZmpoMZz7644WmTkQ1u5F1uf+cz3aRq3xLZVjWCsESJRMr3ilnyhxXACjureCV s0VjYQncyJ6XpV2HLx90c1BiiZsnHGJPrhJpBOiwTKHK3kcCSInDsOCm+w58LK8hvmbR zbjQ== X-Received: by 10.67.4.234 with SMTP id ch10mr44392136pad.3.1404970645735; Wed, 09 Jul 2014 22:37:25 -0700 (PDT) Received: from cdac.hyderabad.cdac.in ([196.12.45.164]) by mx.google.com with ESMTPSA id su8sm60621023pbc.72.2014.07.09.22.37.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 22:37:25 -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 v2 7/7] net: cpmac: fix in releasing resources Date: Thu, 10 Jul 2014 11:05:45 +0530 Message-Id: <1404970545-26508-8-git-send-email-varkabhadram@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404970545-26508-1-git-send-email-varkabhadram@gmail.com> References: <1404970545-26508-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; }