diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-08 10:35:04 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-08 10:35:04 -0500 |
commit | cc432aee7d5a5cd6c8ae4dd9f5bae56428d1fca2 (patch) | |
tree | cfa45acb470ce311c10eeab133d1ddbdf143662d /drivers/staging | |
parent | Merge tag 'usb-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (diff) | |
parent | tty: serial: fsl_lpuart: free IDs allocated by IDA (diff) | |
download | linux-dev-cc432aee7d5a5cd6c8ae4dd9f5bae56428d1fca2.tar.xz linux-dev-cc432aee7d5a5cd6c8ae4dd9f5bae56428d1fca2.zip |
Merge tag 'tty-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fixes from Greg KH:
"Here are some small tty/serial fixes for 5.6-rc5
Just some small serial driver fixes, and a vt core fixup, full details
are:
- vt fixes for issues found by syzbot
- serdev fix for Apple boxes
- fsl_lpuart serial driver fixes
- MAINTAINER update for incorrect serial files
- new device ids for 8250_exar driver
- mvebu-uart fix
All of these have been in linux-next with no reported issues"
* tag 'tty-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: serial: fsl_lpuart: free IDs allocated by IDA
Revert "tty: serial: fsl_lpuart: drop EARLYCON_DECLARE"
serdev: Fix detection of UART devices on Apple machines.
MAINTAINERS: Add missed files related to Synopsys DesignWare UART
serial: 8250_exar: add support for ACCES cards
tty:serial:mvebu-uart:fix a wrong return
vt: selection, push sel_lock up
vt: selection, push console lock down
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/speakup/selection.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c index a8b4d0c5ab7e..032f3264fba1 100644 --- a/drivers/staging/speakup/selection.c +++ b/drivers/staging/speakup/selection.c @@ -51,9 +51,7 @@ static void __speakup_set_selection(struct work_struct *work) goto unref; } - console_lock(); set_selection_kernel(&sel, tty); - console_unlock(); unref: tty_kref_put(tty); |