Merge 4.6-rc7 into tty-next

We want the pty fixes in here as well so that patches can build on it.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 50979be7aca4..734a635e7363 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -1363,12 +1363,12 @@ static ssize_t tty_line_name(struct tty_driver *driver, int index, char *p)
  *      Locking: tty_mutex must be held. If the tty is found, bump the tty kref.
  */
 static struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver,
-                struct inode *inode, int idx)
+                struct file *file, int idx)
 {
         struct tty_struct *tty;
 
         if (driver->ops->lookup)
-                tty = driver->ops->lookup(driver, inode, idx);
+                tty = driver->ops->lookup(driver, file, idx);
         else
                 tty = driver->ttys[idx];
 
@@ -2035,7 +2035,7 @@ static struct tty_struct *tty_open_by_driver(dev_t device, struct inode *inode,
         }
 
         /* check whether we're reopening an existing tty */
-        tty = tty_driver_lookup_tty(driver, inode, index);
+        tty = tty_driver_lookup_tty(driver, filp, index);
         if (IS_ERR(tty)) {
                 mutex_unlock(&tty_mutex);
                 goto out;