From 01584072800db7fd243668fc90fd3b0b9b79b0bb Mon Sep 17 00:00:00 2001
From: Marek Belisko <marek.belisko@open-nandra.com>
Date: Thu, 9 Dec 2010 16:13:49 +0100
Subject: [PATCH] --- yaml --- r: 228344 b: refs/heads/master c:
 1c46282421c8b31b37323f7b007c4562ce17578c h: refs/heads/master v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fac128f9693a..7d821f6841c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04c6620117488c0ccc612da5f2bcbcde025e9301
+refs/heads/master: 1c46282421c8b31b37323f7b007c4562ce17578c
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index 7dfed41b02ac..0e1fc3f1e055 100644
--- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -198,12 +198,17 @@ static int ft1000_probe(struct usb_interface *interface,
 	if (ret)
 		goto err_thread;
 
-	pft1000info->NetDevRegDone = 1;
+	ret = ft1000InitProc(ft1000dev->net);
+	if (ret)
+		goto err_proc;
 
-	ft1000InitProc(ft1000dev->net);
+	pft1000info->NetDevRegDone = 1;
 
 	return 0;
 
+err_proc:
+	unregister_netdev(ft1000dev->net);
+	free_netdev(ft1000dev->net);
 err_thread:
 	kthread_stop(pft1000info->pPollThread);
 err_load: