mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
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>
This commit is contained in:
parent
c8b124e21d
commit
2dab1ac81b
1 changed files with 3 additions and 3 deletions
|
@ -178,15 +178,13 @@ static int ft1000_probe(struct usb_interface *interface,
|
||||||
|
|
||||||
if (IS_ERR(pft1000info->pPollThread)) {
|
if (IS_ERR(pft1000info->pPollThread)) {
|
||||||
ret = PTR_ERR(pft1000info->pPollThread);
|
ret = PTR_ERR(pft1000info->pPollThread);
|
||||||
goto err_load;
|
goto err_thread;
|
||||||
}
|
}
|
||||||
|
|
||||||
msleep(500);
|
msleep(500);
|
||||||
|
|
||||||
while (!pft1000info->CardReady) {
|
while (!pft1000info->CardReady) {
|
||||||
if (gPollingfailed) {
|
if (gPollingfailed) {
|
||||||
if (pft1000info->pPollThread)
|
|
||||||
kthread_stop(pft1000info->pPollThread);
|
|
||||||
ret = -EIO;
|
ret = -EIO;
|
||||||
goto err_load;
|
goto err_load;
|
||||||
}
|
}
|
||||||
|
@ -207,6 +205,8 @@ static int ft1000_probe(struct usb_interface *interface,
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
err_load:
|
err_load:
|
||||||
|
kthread_stop(pft1000info->pPollThread);
|
||||||
|
err_thread:
|
||||||
kfree(pFileStart);
|
kfree(pFileStart);
|
||||||
err_fw:
|
err_fw:
|
||||||
kfree(ft1000dev);
|
kfree(ft1000dev);
|
||||||
|
|
Loading…
Reference in a new issue