diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2013-05-13 00:03:07 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 16:14:49 -0700 |
| commit | 939d84ee091b09aa009cd8edd2f397eca9f60242 (patch) | |
| tree | 0c5be7cf5250824b01b7ecc532ebc990d7eafdc4 | |
| parent | 89c9df1b7974133c9402c2865da937d81e4b2232 (diff) | |
staging: speakup: thread: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/speakup/thread.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/speakup/thread.c b/drivers/staging/speakup/thread.c index 42fa660a7e0d..4397c8e898c7 100644 --- a/drivers/staging/speakup/thread.c +++ b/drivers/staging/speakup/thread.c @@ -22,7 +22,7 @@ int speakup_thread(void *data) while (1) { DEFINE_WAIT(wait); while (1) { - spk_lock(flags); + spin_lock_irqsave(&speakup_info.spinlock, flags); our_sound = spk_unprocessed_sound; spk_unprocessed_sound.active = 0; prepare_to_wait(&speakup_event, &wait, @@ -32,7 +32,7 @@ int speakup_thread(void *data) (synth && synth->catch_up && synth->alive && (speakup_info.flushing || !synth_buffer_empty())); - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); if (should_break) break; mutex_unlock(&spk_mutex); |