diff --git a/[refs] b/[refs]
index fe96bae3798c..e0d8b9fd69a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebc02e9c524e9ff377dd8a3820522d381adf19c8
+refs/heads/master: 96642d42f076101ba98866363d908cab706d156c
diff --git a/trunk/net/x25/x25_link.c b/trunk/net/x25/x25_link.c
index 4cbc942f762a..21306928d47f 100644
--- a/trunk/net/x25/x25_link.c
+++ b/trunk/net/x25/x25_link.c
@@ -396,9 +396,12 @@ void __exit x25_link_free(void)
 	write_lock_bh(&x25_neigh_list_lock);
 
 	list_for_each_safe(entry, tmp, &x25_neigh_list) {
+		struct net_device *dev;
+
 		nb = list_entry(entry, struct x25_neigh, node);
+		dev = nb->dev;
 		__x25_remove_neigh(nb);
-		dev_put(nb->dev);
+		dev_put(dev);
 	}
 	write_unlock_bh(&x25_neigh_list_lock);
 }