Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 368991
b: refs/heads/master
c: fd86c9b
h: refs/heads/master
i:
  368989: 9a19863
  368987: cba89d5
  368983: c30efb4
  368975: 31e6a64
  368959: ab1d243
v: v3
  • Loading branch information
Karl Relton authored and Gustavo Padovan committed Mar 8, 2013
1 parent 8e32a09 commit b12b596
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bed71748346ae0807c7f7a2913965508dbd61403
refs/heads/master: fd86c9becc1154ee5643caafedf7cbdf8241c176
4 changes: 4 additions & 0 deletions trunk/net/bluetooth/hidp/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit b12b596

Please sign in to comment.