diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-08-19 08:47:32 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-08-19 08:47:32 -0500 |
| commit | 0dc6903b3b36381d95ecdef9a7f1ba2e2146d36d (patch) | |
| tree | c2b63ac12a04c9ad7aba918abf9d790a464bf618 | |
| parent | 52a28df7da3a08227d3d85fd0352c2cf2f7871e3 (diff) | |
| parent | 726a88c237f0fd8510e208ea367c614e48d1fa39 (diff) | |
Merge branch 'linaro-no-preempt-rt' into linaro-preempt-rtlinux-lng-preempt-rt-3.10.6-2013.08
| -rw-r--r-- | drivers/tty/serial/samsung.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index 0c8a9fa2be6c..aaa0df1f2fc6 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -249,6 +249,8 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id) ufcon |= S3C2410_UFCON_RESETRX; wr_regl(port, S3C2410_UFCON, ufcon); rx_enabled(port) = 1; + spin_unlock_irqrestore(&port->lock, + flags); goto out; } continue; @@ -297,10 +299,11 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id) ignore_char: continue; } + + spin_unlock_irqrestore(&port->lock, flags); tty_flip_buffer_push(&port->state->port); out: - spin_unlock_irqrestore(&port->lock, flags); return IRQ_HANDLED; } |