1 files changed, 1 insertions, 1 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 4b06d1936375..de1b26aa5720 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -783,7 +783,6 @@ void netpoll_cleanup(struct netpoll *np)
                                 spin_unlock_irqrestore(&npinfo->rx_lock, flags);
                         }
 
-                        np->dev->npinfo = NULL;
                         if (atomic_dec_and_test(&npinfo->refcnt)) {
                                 skb_queue_purge(&npinfo->arp_tx);
                                 skb_queue_purge(&npinfo->txq);
@@ -796,6 +795,7 @@ void netpoll_cleanup(struct netpoll *np)
                                         kfree_skb(skb);
                                 }
                                 kfree(npinfo);
+                                np->dev->npinfo = NULL;
                         }
                 }