diff options
author | William Hubbs <w.d.hubbs@gmail.com> | 2010-10-15 23:13:38 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-19 13:06:05 -0400 |
commit | 7025005f15896118de7724b5e27c67e65612d32f (patch) | |
tree | f37b95ae7f3b35dc19aa951b4d681ac0b3bece58 | |
parent | 1e560261b75e4d7a6584045e332230eb8e0058c4 (diff) |
staging: speakup: thread.c style fixes
fix issues reported by checkpatch.pl
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/speakup/thread.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/speakup/thread.c b/drivers/staging/speakup/thread.c index 84531e70daf0..103c5c81ee85 100644 --- a/drivers/staging/speakup/thread.c +++ b/drivers/staging/speakup/thread.c | |||
@@ -21,11 +21,12 @@ int speakup_thread(void *data) | |||
21 | mutex_lock(&spk_mutex); | 21 | mutex_lock(&spk_mutex); |
22 | while (1) { | 22 | while (1) { |
23 | DEFINE_WAIT(wait); | 23 | DEFINE_WAIT(wait); |
24 | while(1) { | 24 | while (1) { |
25 | spk_lock(flags); | 25 | spk_lock(flags); |
26 | our_sound = unprocessed_sound; | 26 | our_sound = unprocessed_sound; |
27 | unprocessed_sound.active = 0; | 27 | unprocessed_sound.active = 0; |
28 | prepare_to_wait(&speakup_event, &wait, TASK_INTERRUPTIBLE); | 28 | prepare_to_wait(&speakup_event, &wait, |
29 | TASK_INTERRUPTIBLE); | ||
29 | should_break = kthread_should_stop() || | 30 | should_break = kthread_should_stop() || |
30 | our_sound.active || | 31 | our_sound.active || |
31 | (synth && synth->catch_up && synth->alive && | 32 | (synth && synth->catch_up && synth->alive && |
@@ -42,9 +43,8 @@ int speakup_thread(void *data) | |||
42 | if (kthread_should_stop()) | 43 | if (kthread_should_stop()) |
43 | break; | 44 | break; |
44 | 45 | ||
45 | if (our_sound.active) { | 46 | if (our_sound.active) |
46 | kd_mksound(our_sound.freq, our_sound.jiffies); | 47 | kd_mksound(our_sound.freq, our_sound.jiffies); |
47 | } | ||
48 | if (synth && synth->catch_up && synth->alive) { | 48 | if (synth && synth->catch_up && synth->alive) { |
49 | /* It is up to the callee to take the lock, so that it | 49 | /* It is up to the callee to take the lock, so that it |
50 | * can sleep whenever it likes */ | 50 | * can sleep whenever it likes */ |