diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2012-05-23 11:20:07 +0200 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2012-05-30 13:49:03 -0400 |
commit | 2177f80076ebc15cc58fb521b58e49c83315f34e (patch) | |
tree | 3690868d86f360c07c79ea21269ec198293dbec2 /recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0027-drivers-tty-amiserial.c-add-missing-tty_unlock.patch | |
parent | d9d51a11b8ff53c5ee7ef12e221479a24e071f13 (diff) | |
download | meta-ti-2177f80076ebc15cc58fb521b58e49c83315f34e.tar.gz |
linux-ti33x-psp 3.2: update to 3.2.18
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>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0027-drivers-tty-amiserial.c-add-missing-tty_unlock.patch')
-rw-r--r-- | recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0027-drivers-tty-amiserial.c-add-missing-tty_unlock.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0027-drivers-tty-amiserial.c-add-missing-tty_unlock.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0027-drivers-tty-amiserial.c-add-missing-tty_unlock.patch new file mode 100644 index 00000000..4b935aa8 --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/3.2.17/0027-drivers-tty-amiserial.c-add-missing-tty_unlock.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From fefc2c6916651c05eed1882c3a59a6468d91e417 Mon Sep 17 00:00:00 2001 | ||
2 | From: Julia Lawall <Julia.Lawall@lip6.fr> | ||
3 | Date: Thu, 19 Apr 2012 18:12:40 +0200 | ||
4 | Subject: [PATCH 027/165] drivers/tty/amiserial.c: add missing tty_unlock | ||
5 | |||
6 | commit d3a7b83f865b46bb7b5e1ed18a129ce1af349db4 upstream. | ||
7 | |||
8 | tty_unlock is used on all other exits from the function. | ||
9 | |||
10 | Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> | ||
11 | Acked-by: Jiri Slaby <jslaby@suse.cz> | ||
12 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | ||
13 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> | ||
14 | --- | ||
15 | drivers/tty/amiserial.c | 4 +++- | ||
16 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
17 | |||
18 | diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c | ||
19 | index b84c834..8daf073 100644 | ||
20 | --- a/drivers/tty/amiserial.c | ||
21 | +++ b/drivers/tty/amiserial.c | ||
22 | @@ -1113,8 +1113,10 @@ static int set_serial_info(struct async_struct * info, | ||
23 | (new_serial.close_delay != state->close_delay) || | ||
24 | (new_serial.xmit_fifo_size != state->xmit_fifo_size) || | ||
25 | ((new_serial.flags & ~ASYNC_USR_MASK) != | ||
26 | - (state->flags & ~ASYNC_USR_MASK))) | ||
27 | + (state->flags & ~ASYNC_USR_MASK))) { | ||
28 | + tty_unlock(); | ||
29 | return -EPERM; | ||
30 | + } | ||
31 | state->flags = ((state->flags & ~ASYNC_USR_MASK) | | ||
32 | (new_serial.flags & ASYNC_USR_MASK)); | ||
33 | info->flags = ((info->flags & ~ASYNC_USR_MASK) | | ||
34 | -- | ||
35 | 1.7.7.6 | ||
36 | |||