Message ID | 1490017926-11554-1-git-send-email-tim.gardner@canonical.com |
---|---|
State | New |
Headers | show |
A bit confusing that the bug report asks for two changes and this is only one of them... -Stefan
On 03/27/2017 08:11 AM, Stefan Bader wrote: > A bit confusing that the bug report asks for two changes and this is only one of > them... > > -Stefan > > > One of the patches mentioned in the bug report had already been applied.
On Mon, Mar 27, 2017 at 08:33:13AM -0600, Tim Gardner wrote: > On 03/27/2017 08:11 AM, Stefan Bader wrote: > > A bit confusing that the bug report asks for two changes and this is only one of > > them... > > > > -Stefan > > > > > > > > One of the patches mentioned in the bug report had already been applied. > To which branch or which commit id are you referring to? I can't find it in yakkety master-next. Thanks. Cascardo. > -- > Tim Gardner tim.gardner@canonical.com >
Whoops, I did miss a patch. [PATCH 1/2] tty: Fix ldisc crash on reopened tty [PATCH 2/2] UBUNTU: SAUCE: powerpc/powernv/cpuidle: Pass correct rtg
On 29.03.2017 17:31, Tim Gardner wrote: > Whoops, I did miss a patch. > > [PATCH 1/2] tty: Fix ldisc crash on reopened tty > [PATCH 2/2] UBUNTU: SAUCE: powerpc/powernv/cpuidle: Pass correct > > rtg > >
Applied to yakkety master-next branch. Thanks. Cascardo.
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c index 68947f6..4ee7742 100644 --- a/drivers/tty/tty_ldisc.c +++ b/drivers/tty/tty_ldisc.c @@ -669,16 +669,17 @@ int tty_ldisc_reinit(struct tty_struct *tty, int disc) tty_ldisc_put(tty->ldisc); } - /* switch the line discipline */ - tty->ldisc = ld; tty_set_termios_ldisc(tty, disc); - retval = tty_ldisc_open(tty, tty->ldisc); + retval = tty_ldisc_open(tty, ld); if (retval) { if (!WARN_ON(disc == N_TTY)) { - tty_ldisc_put(tty->ldisc); - tty->ldisc = NULL; + tty_ldisc_put(ld); + ld = NULL; } } + + /* switch the line discipline */ + smp_store_release(&tty->ldisc, ld); return retval; }