diff options
| author |   Seunghun Lee <waydi1@gmail.com> | 2014-09-01 22:46:59 +0900 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-02 10:44:33 -0700 |
| commit | 587abd7b030283baf921ba1a62c8a7280fea5e9d (patch) | |
| tree | 1f7f642c1d7b3f7e117203a5484899cd5fe8ba73 /drivers/staging/dgnc/dgnc_neo.c | |
| parent | staging: dgnc: Fix sleeping under spinlock bug (diff) | |
| download | linux-dev-587abd7b030283baf921ba1a62c8a7280fea5e9d.tar.xz linux-dev-587abd7b030283baf921ba1a62c8a7280fea5e9d.zip | |
staging: dgnc: split two assignments into the two assignments on two lines.
split two assignments into the two assignments on two lines.
CC: Lidza Louina <lidza.louina@gmail.com>
CC: Mark Hounschell <markh@compro.net>
Signed-off-by: Seunghun Lee <waydi1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/dgnc/dgnc_neo.c')
| -rw-r--r-- | drivers/staging/dgnc/dgnc_neo.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c index 920ce2d2ed57..d6f4a807e2c4 100644 --- a/drivers/staging/dgnc/dgnc_neo.c +++ b/drivers/staging/dgnc/dgnc_neo.c @@ -626,9 +626,12 @@ static void neo_param(struct tty_struct *tty) * If baud rate is zero, flush queues, and set mval to drop DTR. */ if ((ch->ch_c_cflag & (CBAUD)) == 0) { - ch->ch_r_head = ch->ch_r_tail = 0; - ch->ch_e_head = ch->ch_e_tail = 0; - ch->ch_w_head = ch->ch_w_tail = 0; + ch->ch_r_head = 0; + ch->ch_r_tail = 0; + ch->ch_e_head = 0; + ch->ch_e_tail = 0; + ch->ch_w_head = 0; + ch->ch_w_tail = 0; neo_flush_uart_write(ch); neo_flush_uart_read(ch); @@ -754,7 +757,9 @@ static void neo_param(struct tty_struct *tty) break; } - ier = uart_ier = readb(&ch->ch_neo_uart->ier); + uart_ier = readb(&ch->ch_neo_uart->ier); + ier = uart_ier; + uart_lcr = readb(&ch->ch_neo_uart->lcr); if (baud == 0) @@ -1285,7 +1290,8 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch) * I hope thats okay with everyone? Yes? Good. */ while (qleft < 1) { - ch->ch_r_tail = tail = (tail + 1) & RQUEUEMASK; + tail = (tail + 1) & RQUEUEMASK; + ch->ch_r_tail = tail; ch->ch_err_overrun++; qleft++; } |