[PATCH] Fix netpoll cleanup on abort without dev

If netpoll attempts to use a device without polling support, it will oops
when shutting down.  This adds a check that we've actually attached to a
device.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index daac168875a3d310dde97f8b4be2d48fcb705dc5..ec4dea2d7f7ea9d458c254dc134e3438e472e3a7 100644 (file)
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -614,7 +614,8 @@ void netpoll_cleanup(struct netpoll *np)
                spin_lock_irqsave(&rx_list_lock, flags);
                list_del(&np->rx_list);
 #ifdef CONFIG_NETPOLL_RX
-               np->dev->netpoll_rx = 0;
+               if (np->dev)
+                       np->dev->netpoll_rx = 0;
 #endif
                spin_unlock_irqrestore(&rx_list_lock, flags);
        }