From b12b5963b5aea24f48dd64431f9ca6b8928298b8 Mon Sep 17 00:00:00 2001
From: Karl Relton <karllinuxtest.relton@ntlworld.com>
Date: Wed, 20 Feb 2013 18:16:19 +0000
Subject: [PATCH] --- yaml --- r: 368991 b: refs/heads/master c:
 fd86c9becc1154ee5643caafedf7cbdf8241c176 h: refs/heads/master i:   368989:
 9a198639abbfbdd18c70fad660e0ad3217d133a6   368987:
 cba89d511037c5e5168e78259d9b627b172e6dca   368983:
 c30efb4db8c1a9f6ed3d9847bc7324ff919ba55d   368975:
 31e6a64b6150fd71b3d6d22a2bb154ed34a0eff8   368959:
 ab1d2432d86deb1238026829625f73633686fe4f v: v3

---
 [refs]                          | 2 +-
 trunk/net/bluetooth/hidp/core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 52958c157525..80c21eb2df4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bed71748346ae0807c7f7a2913965508dbd61403
+refs/heads/master: fd86c9becc1154ee5643caafedf7cbdf8241c176
diff --git a/trunk/net/bluetooth/hidp/core.c b/trunk/net/bluetooth/hidp/core.c
index a7352ff3fd1e..2342327f3335 100644
--- a/trunk/net/bluetooth/hidp/core.c
+++ b/trunk/net/bluetooth/hidp/core.c
@@ -311,6 +311,9 @@ static int hidp_get_raw_report(struct hid_device *hid,
 	int numbered_reports = hid->report_enum[report_type].numbered;
 	int ret;
 
+	if (atomic_read(&session->terminate))
+		return -EIO;
+
 	switch (report_type) {
 	case HID_FEATURE_REPORT:
 		report_type = HIDP_TRANS_GET_REPORT | HIDP_DATA_RTYPE_FEATURE;
@@ -722,6 +725,7 @@ static int hidp_session(void *arg)
 		set_current_state(TASK_INTERRUPTIBLE);
 	}
 	set_current_state(TASK_RUNNING);
+	atomic_inc(&session->terminate);
 	remove_wait_queue(sk_sleep(intr_sk), &intr_wait);
 	remove_wait_queue(sk_sleep(ctrl_sk), &ctrl_wait);