From 16df98efdd7b439702763e47513154a0d4f98aa9 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Sun, 24 Jul 2011 00:11:10 -0400 Subject: [PATCH] --- yaml --- r: 263523 b: refs/heads/master c: 3a3f5c7df55a1294c9e6e2d0b8cea604b137438f h: refs/heads/master i: 263521: a7065a1069697b13ef588241435f6c3cd142929b 263519: 7d0537d99e21cd038b361ddb5429f600944385a6 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/cmtp/core.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 92114cbb5a9a..66d79403beea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38d57555616afcdad7381b02b523d494327494cd +refs/heads/master: 3a3f5c7df55a1294c9e6e2d0b8cea604b137438f diff --git a/trunk/net/bluetooth/cmtp/core.c b/trunk/net/bluetooth/cmtp/core.c index c5b11af908be..2eb854ab10f6 100644 --- a/trunk/net/bluetooth/cmtp/core.c +++ b/trunk/net/bluetooth/cmtp/core.c @@ -292,9 +292,11 @@ static int cmtp_session(void *arg) init_waitqueue_entry(&wait, current); add_wait_queue(sk_sleep(sk), &wait); - while (!kthread_should_stop()) { + while (1) { set_current_state(TASK_INTERRUPTIBLE); + if (kthread_should_stop()) + break; if (sk->sk_state != BT_CONNECTED) break; @@ -307,7 +309,7 @@ static int cmtp_session(void *arg) schedule(); } - set_current_state(TASK_RUNNING); + __set_current_state(TASK_RUNNING); remove_wait_queue(sk_sleep(sk), &wait); down_write(&cmtp_session_sem);