mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-17 06:48:07 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From fefc2c6916651c05eed1882c3a59a6468d91e417 Mon Sep 17 00:00:00 2001
|
|
From: Julia Lawall <Julia.Lawall@lip6.fr>
|
|
Date: Thu, 19 Apr 2012 18:12:40 +0200
|
|
Subject: [PATCH 027/165] drivers/tty/amiserial.c: add missing tty_unlock
|
|
|
|
commit d3a7b83f865b46bb7b5e1ed18a129ce1af349db4 upstream.
|
|
|
|
tty_unlock is used on all other exits from the function.
|
|
|
|
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
|
|
Acked-by: Jiri Slaby <jslaby@suse.cz>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
drivers/tty/amiserial.c | 4 +++-
|
|
1 files changed, 3 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
|
|
index b84c834..8daf073 100644
|
|
--- a/drivers/tty/amiserial.c
|
|
+++ b/drivers/tty/amiserial.c
|
|
@@ -1113,8 +1113,10 @@ static int set_serial_info(struct async_struct * info,
|
|
(new_serial.close_delay != state->close_delay) ||
|
|
(new_serial.xmit_fifo_size != state->xmit_fifo_size) ||
|
|
((new_serial.flags & ~ASYNC_USR_MASK) !=
|
|
- (state->flags & ~ASYNC_USR_MASK)))
|
|
+ (state->flags & ~ASYNC_USR_MASK))) {
|
|
+ tty_unlock();
|
|
return -EPERM;
|
|
+ }
|
|
state->flags = ((state->flags & ~ASYNC_USR_MASK) |
|
|
(new_serial.flags & ASYNC_USR_MASK));
|
|
info->flags = ((info->flags & ~ASYNC_USR_MASK) |
|
|
--
|
|
1.7.7.6
|
|
|