From: Dan Carpenter <error27@gmail.com>
Date: Sun, 12 Jun 2011 01:55:22 +0000 (-0700)
Subject: netpoll: call dev_put() on error in netpoll_setup()
X-Git-Tag: v3.0-rc3~13^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83fe32de63e60af34fa8dae83716cb13b8677abd;p=profile%2Fivi%2Fkernel-x86-ivi.git

netpoll: call dev_put() on error in netpoll_setup()

There is a dev_put(ndev) missing on an error path.  This was
introduced in 0c1ad04aecb "netpoll: prevent netpoll setup on slave
devices".

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 42ea4b0..18d9cbd 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -795,7 +795,8 @@ int netpoll_setup(struct netpoll *np)
 	if (ndev->master) {
 		printk(KERN_ERR "%s: %s is a slave device, aborting.\n",
 		       np->name, np->dev_name);
-		return -EBUSY;
+		err = -EBUSY;
+		goto put;
 	}
 
 	if (!netif_running(ndev)) {