diff options
| author | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-02-17 08:32:03 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-02-17 10:38:21 +0100 |
| commit | ddc9c17806d6c0247ae77e36a0bffe4111527dea (patch) | |
| tree | eab2c92d8daf1d66a257900b1df3f7eb5c86ad65 | |
| parent | b7c98d59bf292d705ef701c910477d6330c7f002 (diff) | |
serial/amba-pl011: Return early in deadlock work-around if there is no ttystable-android-ux500-3.1-mali-v9
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 7035910de79..9c723f70c52 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)) { |