aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@gmail.com>2010-11-12 04:27:44 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-16 14:31:21 -0500
commite72115bce326dc893bc1db96db72059a6a08148c (patch)
tree78b859bf4b59c232b19a99a80f480711d742aadb /drivers/staging/ft1000
parent491acf0032c08a74a4c88032ca1c03b498bfec37 (diff)
staging: ft1000: Fix error goto statements.
With commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95 there was intruduced error which lead to stopping uninitialized kthread which leads to kernel panics. This patch fix problems with common entry point in correct way. Signed-off-by: Marek Belisko <marek.belisko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index 99e33390237..6925622795a 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -178,7 +178,7 @@ static int ft1000_probe(struct usb_interface *interface,
178 178
179 if (IS_ERR(pft1000info->pPollThread)) { 179 if (IS_ERR(pft1000info->pPollThread)) {
180 ret = PTR_ERR(pft1000info->pPollThread); 180 ret = PTR_ERR(pft1000info->pPollThread);
181 goto err_thread; 181 goto err_load;
182 } 182 }
183 183
184 msleep(500); 184 msleep(500);
@@ -186,7 +186,7 @@ static int ft1000_probe(struct usb_interface *interface,
186 while (!pft1000info->CardReady) { 186 while (!pft1000info->CardReady) {
187 if (gPollingfailed) { 187 if (gPollingfailed) {
188 ret = -EIO; 188 ret = -EIO;
189 goto err_load; 189 goto err_thread;
190 } 190 }
191 msleep(100); 191 msleep(100);
192 DEBUG("ft1000_probe::Waiting for Card Ready\n"); 192 DEBUG("ft1000_probe::Waiting for Card Ready\n");
@@ -196,7 +196,7 @@ static int ft1000_probe(struct usb_interface *interface,
196 196
197 ret = reg_ft1000_netdev(ft1000dev, interface); 197 ret = reg_ft1000_netdev(ft1000dev, interface);
198 if (ret) 198 if (ret)
199 goto err_load; 199 goto err_thread;
200 200
201 pft1000info->NetDevRegDone = 1; 201 pft1000info->NetDevRegDone = 1;
202 202