summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalle Vahlman <kalle.vahlman@movial.com>2012-02-17 08:32:03 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:17 +0200
commit08906f257d27908c530c0a82ef367caff72529ef (patch)
treea9b627c068e52dfbe429472698372ca5239b5068
parent73c6a8ed0c68d36ccf610a2e526b54d4133dcc74 (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.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 0faee493eff..5bbd97e61ff 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -1120,6 +1120,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)) {