diff --git a/[refs] b/[refs]
index bd680c669062..a4d1b6e1dcea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afaee82c0aef7c2b30acff129c723031343e10c2
+refs/heads/master: d14e37e12087e98b63907518dff83a90297605d6
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index 717d8e9b9833..104aab3c957f 100644
--- a/trunk/drivers/net/ns83820.c
+++ b/trunk/drivers/net/ns83820.c
@@ -1831,11 +1831,13 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
 
 	ndev = alloc_etherdev(sizeof(struct ns83820));
 	dev = PRIV(ndev);
-	dev->ndev = ndev;
+
 	err = -ENOMEM;
 	if (!dev)
 		goto out;
 
+	dev->ndev = ndev;
+
 	spin_lock_init(&dev->rx_info.lock);
 	spin_lock_init(&dev->tx_lock);
 	spin_lock_init(&dev->misc_lock);