diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:02 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-30 23:38:02 +0100 |
| commit | 2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1 (patch) | |
| tree | 411945066af7d953de11184b79b6acf0162964a6 /drivers/tty/tty_io.c | |
| parent | 7eb10bfbbae6025cb7b4bba3db0c1281eac05862 (diff) | |
| parent | 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 (diff) | |
| download | linux-next-2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1.tar.gz linux-next-2cddb06cb020f02a69e4e065599c1e5aa8b4a5d1.zip | |
ASoC: Merge up fixes from Linus' tree
Gets us pine64plus back if nothing else.
Diffstat (limited to 'drivers/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 3959efc717aa..63db04b9113a 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2285,7 +2285,7 @@ static int tiocsti(struct tty_struct *tty, char __user *p) char ch, mbz = 0; struct tty_ldisc *ld; - if (!tty_legacy_tiocsti) + if (!tty_legacy_tiocsti && !capable(CAP_SYS_ADMIN)) return -EIO; if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN)) |