netpoll: Set npinfo to NULL even with ndo_netpoll_cleanup

Since we have to NULL npinfo regardless of whether there is a
ndo_netpoll_cleanup, it makes sense to do this unconditionally
in netpoll_cleanup rather than having every driver do it by
themselves.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index e034342c819c6c5b1d16619386ff602d3472ddac..19ff66079f76e44f6d3284267ca3293e6438cfe2 100644 (file)
--- a/net/core/netpoll.c
+++ b/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;
                        }
                }