Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 40162
b: refs/heads/master
c: 5bb85f1
h: refs/heads/master
v: v3
  • Loading branch information
Dave Kleikamp authored and John W. Linville committed Oct 17, 2006
1 parent c82032a commit ae529e0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 53077944f119808df3d1c6be07241f17a87e7c28
refs/heads/master: 5bb85f18087b10a908bd793e9fd3ccd63aebb724
6 changes: 4 additions & 2 deletions trunk/drivers/net/wireless/airo.c
Original file line number Diff line number Diff line change
Expand Up @@ -3098,7 +3098,8 @@ static int airo_thread(void *data) {
set_bit(JOB_AUTOWEP, &ai->jobs);
break;
}
if (!kthread_should_stop()) {
if (!kthread_should_stop() &&
!freezing(current)) {
unsigned long wake_at;
if (!ai->expires || !ai->scan_timeout) {
wake_at = max(ai->expires,
Expand All @@ -3110,7 +3111,8 @@ static int airo_thread(void *data) {
schedule_timeout(wake_at - jiffies);
continue;
}
} else if (!kthread_should_stop()) {
} else if (!kthread_should_stop() &&
!freezing(current)) {
schedule();
continue;
}
Expand Down

0 comments on commit ae529e0

Please sign in to comment.