From 93fc2df07a387e098daa001a422872dcaebef4e7 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Thu, 14 Jul 2011 14:35:13 +0200 Subject: [PATCH] --- yaml --- r: 267291 b: refs/heads/master c: eff4b0b9fe37873d3dc7ade0e08e6f0f89279b8b h: refs/heads/master i: 267289: 0cb6368dd02625c1a1fb6f78a83b97681add41a6 267287: 4e747bbad8a06ad8a1d11afdecb4783ff5db1739 v: v3 --- [refs] | 2 +- trunk/drivers/tty/amiserial.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 14bb1ed8e3ff..3455a3838618 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a3e492b6daaf7ec4dc41e51d87d2aae8ff886f2 +refs/heads/master: eff4b0b9fe37873d3dc7ade0e08e6f0f89279b8b diff --git a/trunk/drivers/tty/amiserial.c b/trunk/drivers/tty/amiserial.c index 220579592c20..6d43f550b549 100644 --- a/trunk/drivers/tty/amiserial.c +++ b/trunk/drivers/tty/amiserial.c @@ -1529,7 +1529,6 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) { struct async_struct * info = tty->driver_data; unsigned long orig_jiffies, char_time; - int tty_was_locked = tty_locked(); int lsr; if (serial_paranoia_check(info, tty->name, "rs_wait_until_sent")) @@ -1540,12 +1539,6 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) orig_jiffies = jiffies; - /* - * tty_wait_until_sent is called from lots of places, - * with or without the BTM. - */ - if (!tty_was_locked) - tty_lock(); /* * Set the check interval to be 1/5 of the estimated time to * send a single character, and make it at least 1. The check @@ -1586,8 +1579,7 @@ static void rs_wait_until_sent(struct tty_struct *tty, int timeout) break; } __set_current_state(TASK_RUNNING); - if (!tty_was_locked) - tty_unlock(); + #ifdef SERIAL_DEBUG_RS_WAIT_UNTIL_SENT printk("lsr = %d (jiff=%lu)...done\n", lsr, jiffies); #endif