tty: Minor changes to allow kernel modules to use tty ports

Change-Id: Ib8b306082d8733b051add1bd1f9b3ec5b091c53f Signed-off-by: Greg Meiste <w30289@motorola.com> Reviewed-on: http://gerrit.mot.com/774841 SLTApproved: Slta Waiver <sltawvr@motorola.com> SME-Granted: SME Approvals Granted Reviewed-by: Jason Hrycay <jason.hrycay@motorola.com> Submit-Approved: Jason Hrycay <jason.hrycay@motorola.com> Tested-by: Jason Hrycay <jason.hrycay@motorola.com>
MotorolaMobilityLLC · Jun 18, 2016 · 155500f · 155500f
1 parent ad1ddb0
commit 155500f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
@@ -128,6 +128,7 @@ EXPORT_SYMBOL(tty_std_termios);
    into this file */
 
 LIST_HEAD(tty_drivers);			/* linked list of tty drivers */
+EXPORT_SYMBOL(tty_drivers);
 
 /* Mutex to protect creating and releasing a tty. This is shared with
    vt.c for deeply disgusting hack reasons */
@@ -152,7 +153,6 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
 #endif
 static int __tty_fasync(int fd, struct file *filp, int on);
 static int tty_fasync(int fd, struct file *filp, int on);
-static void release_tty(struct tty_struct *tty, int idx);
 static void __proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
 static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty);
 
@@ -1510,6 +1510,7 @@ struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx)
 	release_tty(tty, idx);
 	return ERR_PTR(retval);
 }
+EXPORT_SYMBOL(tty_init_dev);
 
 void tty_free_termios(struct tty_struct *tty)
 {
@@ -1621,7 +1622,7 @@ EXPORT_SYMBOL(tty_kref_put);
  *	of ttys that the driver keeps.
  *
  */
-static void release_tty(struct tty_struct *tty, int idx)
+void release_tty(struct tty_struct *tty, int idx)
 {
 	/* This should always be true but check for the moment */
 	WARN_ON(tty->index != idx);
@@ -1639,6 +1640,7 @@ static void release_tty(struct tty_struct *tty, int idx)
 		tty_kref_put(tty->link);
 	tty_kref_put(tty);
 }
+EXPORT_SYMBOL(release_tty);
 
 /**
  *	tty_release_checks - check a tty before real release

diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
@@ -591,6 +591,7 @@ int tty_set_ldisc(struct tty_struct *tty, int ldisc)
 	tty_unlock(tty);
 	return retval;
 }
+EXPORT_SYMBOL(tty_set_ldisc);
 
 /**
  *	tty_reset_termios	-	reset terminal state

diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
@@ -380,7 +380,7 @@ int tty_port_block_til_ready(struct tty_port *port,
 		port->flags |= ASYNC_NORMAL_ACTIVE;
 		return 0;
 	}
-	if (filp->f_flags & O_NONBLOCK) {
+	if (!filp || filp->f_flags & O_NONBLOCK) {
 		/* Indicate we are open */
 		if (tty->termios.c_cflag & CBAUD)
 			tty_port_raise_dtr_rts(port);
@@ -474,7 +474,7 @@ int tty_port_close_start(struct tty_port *port,
 	unsigned long flags;
 
 	spin_lock_irqsave(&port->lock, flags);
-	if (tty_hung_up_p(filp)) {
+	if (filp && tty_hung_up_p(filp)) {
 		spin_unlock_irqrestore(&port->lock, flags);
 		return 0;
 	}

diff --git a/include/linux/tty.h b/include/linux/tty.h
@@ -494,6 +494,7 @@ extern void free_tty_struct(struct tty_struct *tty);
 extern void deinitialize_tty_struct(struct tty_struct *tty);
 extern struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx);
 extern int tty_release(struct inode *inode, struct file *filp);
+extern void release_tty(struct tty_struct *tty, int idx);
 extern int tty_init_termios(struct tty_struct *tty);
 extern int tty_standard_install(struct tty_driver *driver,
 		struct tty_struct *tty);