diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-26 13:42:20 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-26 13:42:20 -0800 |
| commit | e9a82a4cbe64b78d72c3adaea73352d2b9bab895 (patch) | |
| tree | 91f1fecb1dbb7d5aba8eb4dd863756b0b0b70fd0 /drivers/tty | |
| parent | bd2cd20990bf3d7b47c832e1288dbb8ee73e8bdf (diff) | |
| parent | ef30573ef2b13c0ecbd0302ee00b6921cf0a4aa0 (diff) | |
Merge tag 'v4.4.45' into android-4.4.y
This is the 4.4.45 stable release
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/atmel_serial.c | 11 | ||||
| -rw-r--r-- | drivers/tty/sysrq.c | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index e0b89b961e1b..a0f911641b04 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -470,6 +470,14 @@ static void atmel_stop_tx(struct uart_port *port) /* disable PDC transmit */ atmel_uart_writel(port, ATMEL_PDC_PTCR, ATMEL_PDC_TXTDIS); } + + /* + * Disable the transmitter. + * This is mandatory when DMA is used, otherwise the DMA buffer + * is fully transmitted. + */ + atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXDIS); + /* Disable interrupts */ atmel_uart_writel(port, ATMEL_US_IDR, atmel_port->tx_done_mask); @@ -502,6 +510,9 @@ static void atmel_start_tx(struct uart_port *port) /* Enable interrupts */ atmel_uart_writel(port, ATMEL_US_IER, atmel_port->tx_done_mask); + + /* re-enable the transmitter */ + atmel_uart_writel(port, ATMEL_US_CR, ATMEL_US_TXEN); } /* diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index 5381a728d23e..1fa4128eb88e 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -939,8 +939,8 @@ static const struct input_device_id sysrq_ids[] = { { .flags = INPUT_DEVICE_ID_MATCH_EVBIT | INPUT_DEVICE_ID_MATCH_KEYBIT, - .evbit = { BIT_MASK(EV_KEY) }, - .keybit = { BIT_MASK(KEY_LEFTALT) }, + .evbit = { [BIT_WORD(EV_KEY)] = BIT_MASK(EV_KEY) }, + .keybit = { [BIT_WORD(KEY_LEFTALT)] = BIT_MASK(KEY_LEFTALT) }, }, { }, }; |