diff options
| author | Konrad Zapalowicz | 2014-08-06 21:01:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-08-16 21:23:14 +0200 |
| commit | 1eba3dba7463cddd254605b5372ee38ceb45fa30 (patch) | |
| tree | 22f7aaa8ee63429b44ddc4b5a37ec9fe40a477b9 /drivers/staging/dgnc/dgnc_neo.c | |
| parent | staging: dgnc: Fix included header from 'asm' (diff) | |
| download | kernel-qcow2-linux-1eba3dba7463cddd254605b5372ee38ceb45fa30.tar.gz kernel-qcow2-linux-1eba3dba7463cddd254605b5372ee38ceb45fa30.tar.xz kernel-qcow2-linux-1eba3dba7463cddd254605b5372ee38ceb45fa30.zip | |
staging: dgnc: Fix missing blank line after declarations
This commit deals with the checkapth warnings 'missing line after
declarations' in the dgnc_neo.c file.
Signed-off-by: Konrad Zapalowicz <bergo.torino@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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/staging/dgnc/dgnc_neo.c b/drivers/staging/dgnc/dgnc_neo.c index d58aaa067f4d..79684a355530 100644 --- a/drivers/staging/dgnc/dgnc_neo.c +++ b/drivers/staging/dgnc/dgnc_neo.c @@ -397,6 +397,7 @@ static inline void neo_clear_break(struct channel_t *ch, int force) if (time_after_eq(jiffies, ch->ch_stop_sending_break) || force) { uchar temp = readb(&ch->ch_neo_uart->lcr); + writeb((temp & ~UART_LCR_SBC), &ch->ch_neo_uart->lcr); neo_pci_posting_flush(ch->ch_bd); ch->ch_flags &= ~(CH_BREAK_SENDING); @@ -1138,6 +1139,7 @@ static irqreturn_t neo_intr(int irq, void *voidbrd) static void neo_disable_receiver(struct channel_t *ch) { uchar tmp = readb(&ch->ch_neo_uart->ier); + tmp &= ~(UART_IER_RDI); writeb(tmp, &ch->ch_neo_uart->ier); neo_pci_posting_flush(ch->ch_bd); @@ -1152,6 +1154,7 @@ static void neo_disable_receiver(struct channel_t *ch) static void neo_enable_receiver(struct channel_t *ch) { uchar tmp = readb(&ch->ch_neo_uart->ier); + tmp |= (UART_IER_RDI); writeb(tmp, &ch->ch_neo_uart->ier); neo_pci_posting_flush(ch->ch_bd); @@ -1324,6 +1327,7 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch) */ if (linestatus & error_mask) { uchar discard; + linestatus = 0; memcpy_fromio(&discard, &ch->ch_neo_uart->txrxburst, 1); continue; @@ -1822,6 +1826,7 @@ static void neo_send_break(struct channel_t *ch, int msecs) if (msecs == 0) { if (ch->ch_flags & CH_BREAK_SENDING) { uchar temp = readb(&ch->ch_neo_uart->lcr); + writeb((temp & ~UART_LCR_SBC), &ch->ch_neo_uart->lcr); neo_pci_posting_flush(ch->ch_bd); ch->ch_flags &= ~(CH_BREAK_SENDING); @@ -1841,6 +1846,7 @@ static void neo_send_break(struct channel_t *ch, int msecs) /* Tell the UART to start sending the break */ if (!(ch->ch_flags & CH_BREAK_SENDING)) { uchar temp = readb(&ch->ch_neo_uart->lcr); + writeb((temp | UART_LCR_SBC), &ch->ch_neo_uart->lcr); neo_pci_posting_flush(ch->ch_bd); ch->ch_flags |= (CH_BREAK_SENDING); |