[PATCH 331/510] staging: ft1000: Fix goto error logic.

Greg Kroah-Hartman gregkh at suse.de
Mon Jan 10 20:40:55 UTC 2011


From: Marek Belisko <marek.belisko at open-nandra.com>

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 at open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c |    4 ++--
 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);
-- 
1.7.3.2




More information about the devel mailing list