From ecab8adc02405f8b06e3f6d35b220df071b9361d Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Apr 2008 00:53:34 -0700 Subject: [PATCH] --- yaml --- r: 95181 b: refs/heads/master c: d17468c73e138e1108b279acf892dd35937d43ed h: refs/heads/master i: 95179: 911f0a9a0fd2b75c12d893a050cabd124371dd17 v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_io.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 00715d6dafe9..de2e02da804a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c2630ccf922b7ea2c54c184243d4fb2bd2cf3c6 +refs/heads/master: d17468c73e138e1108b279acf892dd35937d43ed diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index 2460c4c76161..35c7d2eb8b28 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -3459,11 +3459,8 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) switch (cmd) { case TIOCSBRK: case TIOCCBRK: - if (tty->driver->ioctl) { - lock_kernel(); + if (tty->driver->ioctl) retval = tty->driver->ioctl(tty, file, cmd, arg); - unlock_kernel(); - } return retval; /* These two ioctl's always return success; even if */ @@ -3584,18 +3581,14 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; } if (tty->driver->ioctl) { - lock_kernel(); retval = (tty->driver->ioctl)(tty, file, cmd, arg); - unlock_kernel(); if (retval != -ENOIOCTLCMD) return retval; } ld = tty_ldisc_ref_wait(tty); retval = -EINVAL; if (ld->ioctl) { - lock_kernel(); retval = ld->ioctl(tty, file, cmd, arg); - unlock_kernel(); if (retval == -ENOIOCTLCMD) retval = -EINVAL; }