netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 <varkab@cdac.in>
Subject: [PATCH net 7/7] net: cpamc: fix in releasing resources
Date: Thu, 10 Jul 2014 10:18:00 +0530	[thread overview]
Message-ID: <1404967680-13206-8-git-send-email-varkabhadram@gmail.com> (raw)
In-Reply-To: <1404967680-13206-1-git-send-email-varkabhadram@gmail.com>

From: Varka Bhadram <varkab@cdac.in>

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 <varkab@cdac.in>
---
 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;
 }
 
-- 
1.7.9.5

  parent reply	other threads:[~2014-07-10  4:49 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-10  4:47 [PATCH net 0/7] cleanup for AR7 CPMAC Ethernet controller driver varkabhadram
2014-07-10  4:47 ` [PATCH net 1/7] net: cpmac: remove space in macro defination varkabhadram
2014-07-10 15:30   ` Florian Fainelli
2014-07-10 15:38     ` Joe Perches
2014-07-10  4:47 ` [PATCH net 2/7] net: cpmac: fix comments varkabhadram
2014-07-10  4:47 ` [PATCH net 3/7] net: cpmac: dynamic debug fixes varkabhadram
2014-07-10  4:47 ` [PATCH net 4/7] net: cpmac: fix cpmac driver structure varkabhadram
2014-07-10  4:47 ` [PATCH net 5/7] net: cpmac: fix missing a blank line after declarations varkabhadram
2014-07-10  4:47 ` [PATCH net 6/7] net: cpmac: fix proper spacing before return statement varkabhadram
2014-07-10  4:48 ` varkabhadram [this message]
2014-07-10  5:27 ` [PATCH net 0/7] cleanup for AR7 CPMAC Ethernet controller driver David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1404967680-13206-8-git-send-email-varkabhadram@gmail.com \
    --to=varkabhadram@gmail.com \
    --cc=balbi@ti.com \
    --cc=davem@davemloft.net \
    --cc=george.cherian@ti.com \
    --cc=linux@rainbow-software.org \
    --cc=mugunthanvnm@ti.com \
    --cc=netdev@vger.kernel.org \
    --cc=varkab@cdac.in \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).