diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 00:21:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-24 00:21:27 -0700 |
| commit | 472e449c1018a6ef81bc6e38ddfc1eaab9378ca6 (patch) | |
| tree | 8bc4da2376ee0030396ca00a932ac7af22c46e83 /drivers/char/rocket.c | |
| parent | 6d87f207c04370681b9a710b8dbed0f567491e49 (diff) | |
| parent | 5d56356a2c9f5e96efe7a095cbf9b6fee8265d22 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
68328serial: check return value of copy_*_user() instead of access_ok()
synclink: add mutex_unlock() on error path
rocket: add a mutex_unlock()
ip2: return -EFAULT on copy_to_user errors
ip2: remove unneeded NULL check
serial: print early console device address in hex
Diffstat (limited to 'drivers/char/rocket.c')
| -rw-r--r-- | drivers/char/rocket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 79c3bc69165a..7c79d243acc9 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c @@ -1244,6 +1244,7 @@ static int set_config(struct tty_struct *tty, struct r_port *info, } info->flags = ((info->flags & ~ROCKET_USR_MASK) | (new_serial.flags & ROCKET_USR_MASK)); configure_r_port(tty, info, NULL); + mutex_unlock(&info->port.mutex); return 0; } |