diff --git a/[refs] b/[refs]
index 58935562d974..3e7a8ae6415f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f31f5f051269746179b01017fc5e3dcf6b37c67e
+refs/heads/master: 6ca4f65e6b390d09e1de7280cf9fd4f5d8e4b48b
diff --git a/trunk/include/linux/netpoll.h b/trunk/include/linux/netpoll.h
index c0d8b90c5202..449a4fde6587 100644
--- a/trunk/include/linux/netpoll.h
+++ b/trunk/include/linux/netpoll.h
@@ -53,8 +53,8 @@ static inline void netpoll_poll_lock(struct net_device *dev)
 static inline void netpoll_poll_unlock(struct net_device *dev)
 {
 	if (dev->np) {
-		spin_unlock(&dev->np->poll_lock);
 		dev->np->poll_owner = -1;
+		spin_unlock(&dev->np->poll_lock);
 	}
 }