---

yaml --- r: 253436 b: refs/heads/master c: 83fe32d h: refs/heads/master v: v3
git-mirror · Jun 12, 2011 · aab5e59 · aab5e59
1 parent acd215e
commit aab5e59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)) {