Skip to content

Commit

Permalink
staging: ft1000: Create common return point.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marek Belisko authored and Greg Kroah-Hartman committed Nov 11, 2010
1 parent c8b124e commit 2dab1ac
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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);
Expand Down

0 comments on commit 2dab1ac

Please sign in to comment.