From: Marek Belisko <marek.belisko@gmail.com>
Date: Wed, 10 Nov 2010 09:04:30 +0000 (+0100)
Subject: staging: ft1000: Create common return point.
X-Git-Tag: v2.6.38-rc1~423^2~321
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2dab1ac81b4767095f96503a9ac093a68c6e9c95;p=karo-tx-linux.git

staging: ft1000: Create common return point.

When reg_ft1000_netdev() fails created kthread isn't stopped.
So add return point for stopping thread.

Signed-off-by: Marek Belisko <marek.belisko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index dcbc97c432e5..99e333902376 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -178,15 +178,13 @@ static int ft1000_probe(struct usb_interface *interface,
 
 	if (IS_ERR(pft1000info->pPollThread)) {
 		ret = PTR_ERR(pft1000info->pPollThread);
-		goto err_load;
+		goto err_thread;
 	}
 
 	msleep(500);
 
 	while (!pft1000info->CardReady) {
 		if (gPollingfailed) {
-			if (pft1000info->pPollThread)
-				kthread_stop(pft1000info->pPollThread);
 			ret = -EIO;
 			goto err_load;
 		}
@@ -207,6 +205,8 @@ static int ft1000_probe(struct usb_interface *interface,
 	return 0;
 
 err_load:
+	kthread_stop(pft1000info->pPollThread);
+err_thread:
 	kfree(pFileStart);
 err_fw:
 	kfree(ft1000dev);