diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-05-03 17:24:08 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-04 19:58:47 -0400 |
| commit | d29f3ef39be4eec0362b985305fc526d9be318cf (patch) | |
| tree | 35da6af15a899ca767841b864cb1ef290a0f3d4a /drivers/tty/synclink.c | |
| parent | d739e65bb21d34f0f5d3bf4048410e534fbec148 (diff) | |
tty_lock: Localise the lock
In each remaining case the tty_lock is associated with a specific tty. This
means we can now lock on a per tty basis. We do need tty_lock_pair() for
the pty case. Uglier but still a step in the right direction.
[fixed up calls in 3 missing drivers - gregkh]
Signed-off-by: Alan Cox <alan@linux.intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/synclink.c')
| -rw-r--r-- | drivers/tty/synclink.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c index 593d40ad0a6b..5ed0daae6564 100644 --- a/drivers/tty/synclink.c +++ b/drivers/tty/synclink.c | |||
| @@ -3338,9 +3338,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, | |||
| 3338 | printk("%s(%d):block_til_ready blocking on %s count=%d\n", | 3338 | printk("%s(%d):block_til_ready blocking on %s count=%d\n", |
| 3339 | __FILE__,__LINE__, tty->driver->name, port->count ); | 3339 | __FILE__,__LINE__, tty->driver->name, port->count ); |
| 3340 | 3340 | ||
| 3341 | tty_unlock(); | 3341 | tty_unlock(tty); |
| 3342 | schedule(); | 3342 | schedule(); |
| 3343 | tty_lock(); | 3343 | tty_lock(tty); |
| 3344 | } | 3344 | } |
| 3345 | 3345 | ||
| 3346 | set_current_state(TASK_RUNNING); | 3346 | set_current_state(TASK_RUNNING); |