aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2010-12-09 10:13:49 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 19:35:13 -0500
commit1c46282421c8b31b37323f7b007c4562ce17578c (patch)
treebbea6229d897b305d071709faa5bae333907afe7 /drivers/staging/ft1000
parent04c6620117488c0ccc612da5f2bcbcde025e9301 (diff)
staging: ft1000: Use return value for ft1000InitProc.
Add checking for return value ft1000InitProc and cleanup if something fail. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.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.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index 7dfed41b02a..0e1fc3f1e05 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -198,12 +198,17 @@ static int ft1000_probe(struct usb_interface *interface,
198 if (ret) 198 if (ret)
199 goto err_thread; 199 goto err_thread;
200 200
201 pft1000info->NetDevRegDone = 1; 201 ret = ft1000InitProc(ft1000dev->net);
202 if (ret)
203 goto err_proc;
202 204
203 ft1000InitProc(ft1000dev->net); 205 pft1000info->NetDevRegDone = 1;
204 206
205 return 0; 207 return 0;
206 208
209err_proc:
210 unregister_netdev(ft1000dev->net);
211 free_netdev(ft1000dev->net);
207err_thread: 212err_thread:
208 kthread_stop(pft1000info->pPollThread); 213 kthread_stop(pft1000info->pPollThread);
209err_load: 214err_load: