From aab5e596e1f01266bb433c13b2d4123acbca4dcd Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 11 Jun 2011 18:55:22 -0700
Subject: [PATCH] --- yaml --- r: 253436 b: refs/heads/master c:
 83fe32de63e60af34fa8dae83716cb13b8677abd h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/netpoll.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index acc32dd9215f..86919c7fbfa3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1c089e3192f1afdfa76226dc38ef81b08ac810d
+refs/heads/master: 83fe32de63e60af34fa8dae83716cb13b8677abd
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index 42ea4b0e59f1..18d9cbda3a39 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/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)) {