diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 14:03:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-10 14:03:31 -0400 |
commit | 91dbc047e9c1284634ae3570c0382c2288c5548b (patch) | |
tree | d0df267e626e6404dd040be94c670eed2eddfbc1 | |
parent | ef19df60c9506e7ffe78d6a60048936c4e76a0a2 (diff) | |
parent | b1d562acc78f0af46de0dfe447410bc40bdb7ece (diff) |
Merge tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging fixes from Greg KH:
"Here are two tiny staging tree fixes for 4.3-rc5.
One fixes the broken speakup subsystem as reported by a user, and the
other removes an entry in the MAINTAINERS file for a developer that
doesn't want to be listed anymore"
* tag 'staging-4.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: speakup: fix speakup-r regression
MAINTAINERS: Remove myself as nvec co-maintainer
-rw-r--r-- | MAINTAINERS | 1 | ||||
-rw-r--r-- | drivers/staging/speakup/fakekey.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 60aacd88bd7f..b9ce3c6049b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -9914,7 +9914,6 @@ S: Maintained | |||
9914 | F: drivers/staging/lustre | 9914 | F: drivers/staging/lustre |
9915 | 9915 | ||
9916 | STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) | 9916 | STAGING - NVIDIA COMPLIANT EMBEDDED CONTROLLER INTERFACE (nvec) |
9917 | M: Julian Andres Klode <jak@jak-linux.org> | ||
9918 | M: Marc Dietrich <marvin24@gmx.de> | 9917 | M: Marc Dietrich <marvin24@gmx.de> |
9919 | L: ac100@lists.launchpad.net (moderated for non-subscribers) | 9918 | L: ac100@lists.launchpad.net (moderated for non-subscribers) |
9920 | L: linux-tegra@vger.kernel.org | 9919 | L: linux-tegra@vger.kernel.org |
diff --git a/drivers/staging/speakup/fakekey.c b/drivers/staging/speakup/fakekey.c index 4299cf45f947..5e1f16c36b49 100644 --- a/drivers/staging/speakup/fakekey.c +++ b/drivers/staging/speakup/fakekey.c | |||
@@ -81,6 +81,7 @@ void speakup_fake_down_arrow(void) | |||
81 | __this_cpu_write(reporting_keystroke, true); | 81 | __this_cpu_write(reporting_keystroke, true); |
82 | input_report_key(virt_keyboard, KEY_DOWN, PRESSED); | 82 | input_report_key(virt_keyboard, KEY_DOWN, PRESSED); |
83 | input_report_key(virt_keyboard, KEY_DOWN, RELEASED); | 83 | input_report_key(virt_keyboard, KEY_DOWN, RELEASED); |
84 | input_sync(virt_keyboard); | ||
84 | __this_cpu_write(reporting_keystroke, false); | 85 | __this_cpu_write(reporting_keystroke, false); |
85 | 86 | ||
86 | /* reenable preemption */ | 87 | /* reenable preemption */ |