From a5c68f9ceafe761ccc6c0d1f8bd7f024af3b19fa Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Tue, 11 Jun 2013 15:40:20 -0400 Subject: [PATCH] --- yaml --- r: 377395 b: refs/heads/master c: ea05fea9042620ac3b8ab9a3e5e4d2ed80c89244 h: refs/heads/master i: 377393: fbeff95230583a95cc3ce8e814b45967d1bb72e0 377391: 074095e5988a0ba9557ec5e67af79b53a2824922 v: v3 --- [refs] | 2 +- trunk/drivers/bluetooth/btmrvl_main.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5df5ad1192d5..9b6485af5baf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59f45d576a0715026d1919ab8a12047616204656 +refs/heads/master: ea05fea9042620ac3b8ab9a3e5e4d2ed80c89244 diff --git a/trunk/drivers/bluetooth/btmrvl_main.c b/trunk/drivers/bluetooth/btmrvl_main.c index 3a4343b3bd6d..9a9f51875df5 100644 --- a/trunk/drivers/bluetooth/btmrvl_main.c +++ b/trunk/drivers/bluetooth/btmrvl_main.c @@ -498,6 +498,10 @@ static int btmrvl_service_main_thread(void *data) add_wait_queue(&thread->wait_q, &wait); set_current_state(TASK_INTERRUPTIBLE); + if (kthread_should_stop()) { + BT_DBG("main_thread: break from main thread"); + break; + } if (adapter->wakeup_tries || ((!adapter->int_count) && @@ -513,11 +517,6 @@ static int btmrvl_service_main_thread(void *data) BT_DBG("main_thread woke up"); - if (kthread_should_stop()) { - BT_DBG("main_thread: break from main thread"); - break; - } - spin_lock_irqsave(&priv->driver_lock, flags); if (adapter->int_count) { adapter->int_count = 0;