diff options
author | Jani Nikula <jani.nikula@intel.com> | 2019-05-28 11:07:59 +0300 |
---|---|---|
committer | Jani Nikula <jani.nikula@intel.com> | 2019-05-28 11:07:59 +0300 |
commit | 2491b544ff3aa9717d427033206fa793be53429d (patch) | |
tree | 71b5fc8897495a791519ece54c14f81484c48ae9 /drivers/tty/tty_jobctrl.c | |
parent | b27e35ae5b1804078cfd177082429eea9de01885 (diff) | |
parent | 14ee642c2ab0a3d8a1ded11fade692d8b77172b9 (diff) |
Merge drm/drm-next into drm-intel-next-queued
Get the HDR dependencies originally merged via drm-misc. Sync up all
i915 changes applied via other trees. And get v5.2-rc2 as the baseline.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/tty/tty_jobctrl.c')
-rw-r--r-- | drivers/tty/tty_jobctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/tty_jobctrl.c b/drivers/tty/tty_jobctrl.c index c4ecd66fafef..f8ed50a16848 100644 --- a/drivers/tty/tty_jobctrl.c +++ b/drivers/tty/tty_jobctrl.c @@ -44,7 +44,7 @@ int __tty_check_change(struct tty_struct *tty, int sig) tty_pgrp = tty->pgrp; spin_unlock_irqrestore(&tty->ctrl_lock, flags); - if (tty_pgrp && pgrp != tty->pgrp) { + if (tty_pgrp && pgrp != tty_pgrp) { if (is_ignored(sig)) { if (sig == SIGTTIN) ret = -EIO; @@ -313,7 +313,7 @@ void disassociate_ctty(int on_exit) read_unlock(&tasklist_lock); } -/** +/* * * no_tty - Ensure the current process does not have a controlling tty */ |