summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2010-11-24 10:42:39 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-11-29 11:45:24 -0800
commit4960b8fe1b0602195e2170bb94d50edc47d36d73 (patch)
treea34266c75c5ef6450e294ea5540e18800275eae3
parente999fb057436c2167d5ee3f5c82753e953981525 (diff)
downloadop-kernel-dev-4960b8fe1b0602195e2170bb94d50edc47d36d73.zip
op-kernel-dev-4960b8fe1b0602195e2170bb94d50edc47d36d73.tar.gz
staging: ft1000: Fix goto error logic.
Fix goto error logic which could lead to kernel panics because kthread_stop() is called in not correct error conditions. Seen it sometimes when dsp_reload() fails then I got kernel panic. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_usb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
index f88ff86..d71ac30 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
@@ -204,9 +204,9 @@ static int ft1000_probe(struct usb_interface *interface,
return 0;
-err_load:
- kthread_stop(pft1000info->pPollThread);
err_thread:
+ kthread_stop(pft1000info->pPollThread);
+err_load:
kfree(pFileStart);
err_fw:
kfree(ft1000dev);
OpenPOWER on IntegriCloud