summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2009-04-03 03:56:36 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 06:04:48 +0400
commit846c151a4de188bb8f7043097518dab2ff5b5c2c (patch)
tree9ba48a2dbb8ecd137d7bf41039fa628bab75824e
parentb6fac63cc1f52ec27f29fe6c6c8494a2ffac33fd (diff)
downloadlinux-846c151a4de188bb8f7043097518dab2ff5b5c2c.tar.xz
__tty_open(): use the correct type for saved_flags
filp->f_flags is unsigned, so use that type for the local copy. Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/tty_io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 33dac94922a7..a44b701c5bba 100644
--- a/drivers/char/tty_io.c
+++ b/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);