[SPARC64]: Fix oops on runlevel change with serial console.
Incorrect uart_write_wakeup() calls cause reference to a NULL tty pointer in sunsab and sunzilog serial drivers. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
907a426179
commit
b8df110fea
2 changed files with 2 additions and 4 deletions
|
@ -274,7 +274,6 @@ static void transmit_chars(struct uart_sunsab_port *up,
|
|||
if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
|
||||
up->interrupt_mask1 |= SAB82532_IMR1_XPR;
|
||||
writeb(up->interrupt_mask1, &up->regs->w.imr1);
|
||||
uart_write_wakeup(&up->port);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -517,10 +517,9 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_port *up,
|
|||
if (up->port.info == NULL)
|
||||
goto ack_tx_int;
|
||||
xmit = &up->port.info->xmit;
|
||||
if (uart_circ_empty(xmit)) {
|
||||
uart_write_wakeup(&up->port);
|
||||
if (uart_circ_empty(xmit))
|
||||
goto ack_tx_int;
|
||||
}
|
||||
|
||||
if (uart_tx_stopped(&up->port))
|
||||
goto ack_tx_int;
|
||||
|
||||
|
|
Loading…
Reference in a new issue