diff options
Diffstat (limited to 'drivers/tty/tty_io.c')
-rw-r--r-- | drivers/tty/tty_io.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index fde5a4dae3dd..83af24ca1e5e 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c | |||
@@ -2481,7 +2481,6 @@ static int tty_tiocmget(struct tty_struct *tty, int __user *p) | |||
2481 | /** | 2481 | /** |
2482 | * tty_tiocmset - set modem status | 2482 | * tty_tiocmset - set modem status |
2483 | * @tty: tty device | 2483 | * @tty: tty device |
2484 | * @file: user file pointer | ||
2485 | * @cmd: command - clear bits, set bits or set all | 2484 | * @cmd: command - clear bits, set bits or set all |
2486 | * @p: pointer to desired bits | 2485 | * @p: pointer to desired bits |
2487 | * | 2486 | * |
@@ -2491,7 +2490,7 @@ static int tty_tiocmget(struct tty_struct *tty, int __user *p) | |||
2491 | * Locking: none (up to the driver) | 2490 | * Locking: none (up to the driver) |
2492 | */ | 2491 | */ |
2493 | 2492 | ||
2494 | static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int cmd, | 2493 | static int tty_tiocmset(struct tty_struct *tty, unsigned int cmd, |
2495 | unsigned __user *p) | 2494 | unsigned __user *p) |
2496 | { | 2495 | { |
2497 | int retval; | 2496 | int retval; |
@@ -2518,7 +2517,7 @@ static int tty_tiocmset(struct tty_struct *tty, struct file *file, unsigned int | |||
2518 | } | 2517 | } |
2519 | set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP; | 2518 | set &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP; |
2520 | clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP; | 2519 | clear &= TIOCM_DTR|TIOCM_RTS|TIOCM_OUT1|TIOCM_OUT2|TIOCM_LOOP; |
2521 | return tty->ops->tiocmset(tty, file, set, clear); | 2520 | return tty->ops->tiocmset(tty, set, clear); |
2522 | } | 2521 | } |
2523 | 2522 | ||
2524 | static int tty_tiocgicount(struct tty_struct *tty, void __user *arg) | 2523 | static int tty_tiocgicount(struct tty_struct *tty, void __user *arg) |
@@ -2659,7 +2658,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
2659 | case TIOCMSET: | 2658 | case TIOCMSET: |
2660 | case TIOCMBIC: | 2659 | case TIOCMBIC: |
2661 | case TIOCMBIS: | 2660 | case TIOCMBIS: |
2662 | return tty_tiocmset(tty, file, cmd, p); | 2661 | return tty_tiocmset(tty, cmd, p); |
2663 | case TIOCGICOUNT: | 2662 | case TIOCGICOUNT: |
2664 | retval = tty_tiocgicount(tty, p); | 2663 | retval = tty_tiocgicount(tty, p); |
2665 | /* For the moment allow fall through to the old method */ | 2664 | /* For the moment allow fall through to the old method */ |