diff options
| author | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-02-16 21:31:40 +0200 |
|---|---|---|
| committer | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-02-17 09:50:57 +0200 |
| commit | 70d89b97afcbb911c21a0fb6ac2c8130dd87e9ae (patch) | |
| tree | 62818d980f3e0987be0cf60a11436cd574929cef | |
| parent | d572c7744e3e50497d0dde514b90e912d87ee7d8 (diff) | |
serial/amba-pl011: Return early in deadlock work-around if there is no tty
The first amba port does not always have an attached tty, which will
result in a crash if the work-around is activated.
This seems to be the case for example on Snowball which has no modem
hw, which seems to be the main use-case for this work-around.
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index fb8809d7d04..a57efebe79b 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -1107,6 +1107,10 @@ static void pl011_lockup_wa(unsigned long data) int buf_empty_retries = 200; int loop; + /* Exit early if there is no tty */ + if (!tty) + return; + /* Stop HCI layer from submitting data for tx */ tty->hw_stopped = 1; while (!uart_circ_empty(xmit)) { |