Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b8df110fea555d5088bba67f446c2435104405be

Authored by David S. Miller
1 parent 907a426179
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 2 changed files with 2 additions and 4 deletions Side-by-side Diff

drivers/serial/sunsab.c
Diff comments   View file @ b8df110
... ... @@ -274,7 +274,6 @@
274 274 if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) {
275 275 up->interrupt_mask1 |= SAB82532_IMR1_XPR;
276 276 writeb(up->interrupt_mask1, &up->regs->w.imr1);
277   - uart_write_wakeup(&up->port);
278 277 return;
279 278 }
280 279  
drivers/serial/sunzilog.c
Diff comments   View file @ b8df110
... ... @@ -517,10 +517,9 @@
517 517 if (up->port.info == NULL)
518 518 goto ack_tx_int;
519 519 xmit = &up->port.info->xmit;
520   - if (uart_circ_empty(xmit)) {
521   - uart_write_wakeup(&up->port);
  520 + if (uart_circ_empty(xmit))
522 521 goto ack_tx_int;
523   - }
  522 +
524 523 if (uart_tx_stopped(&up->port))
525 524 goto ack_tx_int;
526 525