diff --git a/[refs] b/[refs]
index f12e4d9b487c..6e18360a46d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6fac63cc1f52ec27f29fe6c6c8494a2ffac33fd
+refs/heads/master: 846c151a4de188bb8f7043097518dab2ff5b5c2c
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index 33dac94922a7..a44b701c5bba 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -1758,7 +1758,7 @@ static int __tty_open(struct inode *inode, struct file *filp)
 	struct tty_driver *driver;
 	int index;
 	dev_t device = inode->i_rdev;
-	unsigned short saved_flags = filp->f_flags;
+	unsigned saved_flags = filp->f_flags;
 
 	nonseekable_open(inode, filp);