Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8156
b: refs/heads/master
c: bf4de6f
h: refs/heads/master
v: v3
  • Loading branch information
Daniel Ritz authored and Linus Torvalds committed Sep 9, 2005
1 parent ca502e5 commit 3f1ccd6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 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: b3743fa4442fc172e950ff0eaf6aa96e7d5ce9be
refs/heads/master: bf4de6f2db79f3c396bd884f546cd2ea91a686f2
9 changes: 5 additions & 4 deletions trunk/drivers/pcmcia/cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,10 @@ static int pccardd(void *__skt)
skt->thread = NULL;
complete_and_exit(&skt->thread_done, 0);
}
complete(&skt->thread_done);

add_wait_queue(&skt->thread_wait, &wait);
complete(&skt->thread_done);

for (;;) {
unsigned long flags;
unsigned int events;
Expand All @@ -682,11 +683,11 @@ static int pccardd(void *__skt)
continue;
}

schedule();
try_to_freeze();

if (!skt->thread)
break;

schedule();
try_to_freeze();
}
remove_wait_queue(&skt->thread_wait, &wait);

Expand Down

0 comments on commit 3f1ccd6

Please sign in to comment.