From a922f7b7dfe99021b759c0fd53372205b61f4281 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 17 Jan 2011 10:24:57 +0000
Subject: [PATCH] --- yaml --- r: 231930 b: refs/heads/master c:
 1956cc52e73984a39252994f0beee458fc0d8909 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/ns83820.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 95eb1cade584..4b8b1fb60273 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fdc1c8093255f9da877d7b9ce3f46c2098377dc
+refs/heads/master: 1956cc52e73984a39252994f0beee458fc0d8909
diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c
index 84134c766f3a..a41b2cf4d917 100644
--- a/trunk/drivers/net/ns83820.c
+++ b/trunk/drivers/net/ns83820.c
@@ -1988,12 +1988,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev,
 	}
 
 	ndev = alloc_etherdev(sizeof(struct ns83820));
-	dev = PRIV(ndev);
-
 	err = -ENOMEM;
-	if (!dev)
+	if (!ndev)
 		goto out;
 
+	dev = PRIV(ndev);
 	dev->ndev = ndev;
 
 	spin_lock_init(&dev->rx_info.lock);