---

yaml --- r: 228091 b: refs/heads/master c: e72115b h: refs/heads/master i: 228089: 8068d7a 228087: cf69e27 v: v3
git-mirror · Nov 16, 2010 · 49d59c1 · 49d59c1
1 parent ac05497
commit 49d59c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 491acf0032c08a74a4c88032ca1c03b498bfec37
+refs/heads/master: e72115bce326dc893bc1db96db72059a6a08148c
diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -178,15 +178,15 @@ static int ft1000_probe(struct usb_interface *interface,
 
 	if (IS_ERR(pft1000info->pPollThread)) {
 		ret = PTR_ERR(pft1000info->pPollThread);
-		goto err_thread;
+		goto err_load;
 	}
 
 	msleep(500);
 
 	while (!pft1000info->CardReady) {
 		if (gPollingfailed) {
 			ret = -EIO;
-			goto err_load;
+			goto err_thread;
 		}
 		msleep(100);
 		DEBUG("ft1000_probe::Waiting for Card Ready\n");
@@ -196,7 +196,7 @@ static int ft1000_probe(struct usb_interface *interface,
 
 	ret = reg_ft1000_netdev(ft1000dev, interface);
 	if (ret)
-		goto err_load;
+		goto err_thread;
 
 	pft1000info->NetDevRegDone = 1;