diff options
| author |   William Hubbs <w.d.hubbs@gmail.com> | 2013-05-13 00:02:58 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 16:11:09 -0700 |
| commit | 9fb31b1abdabab0bd7bb490aa04e42e2876a28b0 (patch) | |
| tree | aad6015296c0fde560306e4f5cd19f80bdc417bf /drivers/staging/speakup/serialio.c | |
| parent | staging: speakup: remove spk_trylock macro definition (diff) | |
| download | linux-dev-9fb31b1abdabab0bd7bb490aa04e42e2876a28b0.tar.xz linux-dev-9fb31b1abdabab0bd7bb490aa04e42e2876a28b0.zip | |
staging: speakup: serialio: remove custom locking macros
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/speakup/serialio.c')
| -rw-r--r-- | drivers/staging/speakup/serialio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/speakup/serialio.c b/drivers/staging/speakup/serialio.c index e4d27aa2898f..135428856d47 100644 --- a/drivers/staging/speakup/serialio.c +++ b/drivers/staging/speakup/serialio.c @@ -79,7 +79,7 @@ static irqreturn_t synth_readbuf_handler(int irq, void *dev_id) /*printk(KERN_ERR "in irq\n"); */ /*pr_warn("in IRQ\n"); */ int c; - spk_lock(flags); + spin_lock_irqsave(&speakup_info.spinlock, flags); while (inb_p(speakup_info.port_tts + UART_LSR) & UART_LSR_DR) { c = inb_p(speakup_info.port_tts+UART_RX); @@ -87,7 +87,7 @@ static irqreturn_t synth_readbuf_handler(int irq, void *dev_id) /*printk(KERN_ERR "c = %d\n", c); */ /*pr_warn("C = %d\n", c); */ } - spk_unlock(flags); + spin_unlock_irqrestore(&speakup_info.spinlock, flags); return IRQ_HANDLED; } |