From 0227f91452fab5d84cf48f9dcf2731be279efc23 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 10 Jun 2010 16:12:42 +0000
Subject: [PATCH] --- yaml --- r: 202921 b: refs/heads/master c:
 c04ec8063d3a89e5ae933c7b4be04476fe65c6de h: refs/heads/master i:   202919:
 16297dec288ed13df3c2eb62e92c4eb9b03dc418 v: v3

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

diff --git a/[refs] b/[refs]
index 3269a62bf89f..1db8b4fe96d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ab6c163dee279559e3a62d774af7e4c4c9b4c67
+refs/heads/master: c04ec8063d3a89e5ae933c7b4be04476fe65c6de
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index e034342c819c..19ff66079f76 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -867,8 +867,7 @@ void netpoll_cleanup(struct netpoll *np)
 				ops = np->dev->netdev_ops;
 				if (ops->ndo_netpoll_cleanup)
 					ops->ndo_netpoll_cleanup(np->dev);
-				else
-					np->dev->npinfo = NULL;
+				np->dev->npinfo = NULL;
 			}
 		}