From 73ef71eab2315fe49d1dab035d3f9efb34871f2b Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Tue, 16 Mar 2010 05:29:54 +0000
Subject: [PATCH] --- yaml --- r: 188155 b: refs/heads/master c:
 21edbb223ed2af88b090e7945af7d91d672e3aa6 h: refs/heads/master i:   188153:
 bd60dd0d43467fd471490fad4e1d548f79645106   188151:
 f8e70817fe69ac5b51a459b57f7de8768fd66cc5 v: v3

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

diff --git a/[refs] b/[refs]
index 5f56d53203e8..9f7afb8f93c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a2f46ee1ba5ee249ce2ca1ee7a7a0ac46529fb4f
+refs/heads/master: 21edbb223ed2af88b090e7945af7d91d672e3aa6
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index 7aa697253765..d4ec38fa64e6 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -735,7 +735,7 @@ int netpoll_setup(struct netpoll *np)
 		npinfo = kmalloc(sizeof(*npinfo), GFP_KERNEL);
 		if (!npinfo) {
 			err = -ENOMEM;
-			goto release;
+			goto put;
 		}
 
 		npinfo->rx_flags = 0;
@@ -845,7 +845,7 @@ int netpoll_setup(struct netpoll *np)
 
 		kfree(npinfo);
 	}
-
+put:
 	dev_put(ndev);
 	return err;
 }