Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220391
b: refs/heads/master
c: 7025005
h: refs/heads/master
i:
  220389: 360115e
  220387: 4d70dd8
  220383: 17ec498
v: v3
  • Loading branch information
William Hubbs authored and Greg Kroah-Hartman committed Oct 19, 2010
1 parent e6f6fe4 commit f526ad1
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 1e560261b75e4d7a6584045e332230eb8e0058c4
refs/heads/master: 7025005f15896118de7724b5e27c67e65612d32f
8 changes: 4 additions & 4 deletions trunk/drivers/staging/speakup/thread.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ int speakup_thread(void *data)
mutex_lock(&spk_mutex);
while (1) {
DEFINE_WAIT(wait);
while(1) {
while (1) {
spk_lock(flags);
our_sound = unprocessed_sound;
unprocessed_sound.active = 0;
prepare_to_wait(&speakup_event, &wait, TASK_INTERRUPTIBLE);
prepare_to_wait(&speakup_event, &wait,
TASK_INTERRUPTIBLE);
should_break = kthread_should_stop() ||
our_sound.active ||
(synth && synth->catch_up && synth->alive &&
Expand All @@ -42,9 +43,8 @@ int speakup_thread(void *data)
if (kthread_should_stop())
break;

if (our_sound.active) {
if (our_sound.active)
kd_mksound(our_sound.freq, our_sound.jiffies);
}
if (synth && synth->catch_up && synth->alive) {
/* It is up to the callee to take the lock, so that it
* can sleep whenever it likes */
Expand Down

0 comments on commit f526ad1

Please sign in to comment.