diff --git a/[refs] b/[refs]
index e984cc72c58f..900d7c506ef3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e5510ab0cd73e37b1bf268ec1ec7a071e08a1d5
+refs/heads/master: e55b689268391a3b0a0d20c951b60b2d88a5e105
diff --git a/trunk/drivers/staging/dst/thread_pool.c b/trunk/drivers/staging/dst/thread_pool.c
index c35754d5ec6d..7bed4e851029 100644
--- a/trunk/drivers/staging/dst/thread_pool.c
+++ b/trunk/drivers/staging/dst/thread_pool.c
@@ -115,7 +115,7 @@ void thread_pool_del_worker(struct thread_pool *p)
 {
 	struct thread_pool_worker *w = NULL;
 
-	while (!w) {
+	while (!w && p->thread_num) {
 		wait_event(p->wait, !list_empty(&p->ready_list) || !p->thread_num);
 
 		dprintk("%s: locking list_empty: %d, thread_num: %d.\n",