s390/3270: readd tty3270_open
authorMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 8 Jan 2013 14:15:12 +0000 (15:15 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Thu, 14 Feb 2013 14:55:01 +0000 (15:55 +0100)
Reintroduce the tty3270_open function which has been removed by
git commit 20cda6f2 "TTY: tty3270, add tty install". Without
the open function in the tty_operations tty_open will return
-ENODEV and the 3270 tty will not work.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
drivers/s390/char/tty3270.c

index 43ea0593bdb01aafcc82ceb602e7432c32239711..964018402b36cc3e232cbf78f6c1a1a7f0eb7504 100644 (file)
@@ -925,6 +925,20 @@ static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
        return 0;
 }
 
+/*
+ * This routine is called whenever a 3270 tty is opened.
+ */
+static int
+tty3270_open(struct tty_struct *tty, struct file *filp)
+{
+       struct tty3270 *tp = tty->driver_data;
+       struct tty_port *port = &tp->port;
+
+       port->count++;
+       tty_port_tty_set(port, tty);
+       return 0;
+}
+
 /*
  * This routine is called when the 3270 tty is closed. We wait
  * for the remaining request to be completed. Then we clean up.
@@ -1753,6 +1767,7 @@ static long tty3270_compat_ioctl(struct tty_struct *tty,
 static const struct tty_operations tty3270_ops = {
        .install = tty3270_install,
        .cleanup = tty3270_cleanup,
+       .open = tty3270_open,
        .close = tty3270_close,
        .write = tty3270_write,
        .put_char = tty3270_put_char,