Magellan Linux

Annotation of /trunk/kernel-alx/patches-3.18/0123-3.18.24-all-fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2719 - (hide annotations) (download)
Thu Nov 12 09:12:16 2015 UTC (8 years, 6 months ago) by niro
File size: 714 byte(s)
-linux-3.18.24
1 niro 2719 diff --git a/Makefile b/Makefile
2     index 2ebc49903d33..9769e3bce6a2 100644
3     --- a/Makefile
4     +++ b/Makefile
5     @@ -1,6 +1,6 @@
6     VERSION = 3
7     PATCHLEVEL = 18
8     -SUBLEVEL = 23
9     +SUBLEVEL = 24
10     EXTRAVERSION =
11     NAME = Diseased Newt
12    
13     diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
14     index fea7d905e77c..04e7d8e38c53 100644
15     --- a/drivers/tty/n_tty.c
16     +++ b/drivers/tty/n_tty.c
17     @@ -364,7 +364,6 @@ static void n_tty_packet_mode_flush(struct tty_struct *tty)
18     spin_lock_irqsave(&tty->ctrl_lock, flags);
19     if (tty->link->packet) {
20     tty->ctrl_status |= TIOCPKT_FLUSHREAD;
21     - spin_unlock_irqrestore(&tty->ctrl_lock, flags);
22     wake_up_interruptible(&tty->link->read_wait);
23     }
24     spin_unlock_irqrestore(&tty->ctrl_lock, flags);