From f526ad12ff82df64af610785edaf5b4384a57aea Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 15 Oct 2010 22:13:38 -0500 Subject: [PATCH] --- yaml --- r: 220391 b: refs/heads/master c: 7025005f15896118de7724b5e27c67e65612d32f h: refs/heads/master i: 220389: 360115ed046d7d2b3a52d56257c3a0d0917a2815 220387: 4d70dd887166fac449fd37c4c47c558e7c83c2e9 220383: 17ec498931d26b66ea2a2daad5cc760b7d24eb57 v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/thread.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cbf401b1deb8..4126b61d68a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e560261b75e4d7a6584045e332230eb8e0058c4 +refs/heads/master: 7025005f15896118de7724b5e27c67e65612d32f diff --git a/trunk/drivers/staging/speakup/thread.c b/trunk/drivers/staging/speakup/thread.c index 84531e70daf0..103c5c81ee85 100644 --- a/trunk/drivers/staging/speakup/thread.c +++ b/trunk/drivers/staging/speakup/thread.c @@ -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 && @@ -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 */