summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 14:52:07 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 20:47:01 +0100
commit885f8b0f8ab497b8520f95ff3c1bb7efb1c331ac (patch)
tree3fae6d1e520e30060be79f9413b528c847dcf7e6
parentXTENSA: iss/console, fix potential deadlock (diff)
downloadlinux-885f8b0f8ab497b8520f95ff3c1bb7efb1c331ac.tar.xz
linux-885f8b0f8ab497b8520f95ff3c1bb7efb1c331ac.zip
TTY: iss/console, use tty_port
Even though the port is not used for anything real there yet, this will change as tty buffers will be in tty_port in the near future. So the port will be needed in all drivers. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Chris Zankel <chris@zankel.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/xtensa/platforms/iss/console.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 94ab8eca9d77..d1a7861b81f7 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -37,6 +37,7 @@
#define SERIAL_TIMER_VALUE (20 * HZ)
static struct tty_driver *serial_driver;
+static struct tty_port serial_port;
static struct timer_list serial_timer;
static DEFINE_SPINLOCK(timer_lock);
@@ -68,6 +69,7 @@ static void rs_poll(unsigned long);
static int rs_open(struct tty_struct *tty, struct file * filp)
{
+ tty->port = &serial_port;
spin_lock(&timer_lock);
if (tty->count == 1) {
setup_timer(&serial_timer, rs_poll, (unsigned long)tty);
@@ -202,6 +204,8 @@ static const struct tty_operations serial_ops = {
int __init rs_init(void)
{
+ tty_port_init(&serial_port);
+
serial_driver = alloc_tty_driver(SERIAL_MAX_NUM_LINES);
printk ("%s %s\n", serial_name, serial_version);