[kernel] r12264 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Bastian Blank]

Author: waldi
Date: Sun Sep 28 21:36:46 2008
New Revision: 12264

Log:
Only register notifiers in braille console if used, fixes Insert key.

* debian/changelog: Update.
* debian/patches/bugfix/all/accessibility-braille-notifier-cleanup.patch: Add.
* debian/patches/series/7: Add new patch.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/accessibility-braille-notifier-cleanup.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/7

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Sep 28 21:36:46 2008
@@ -2,6 +2,8 @@
 
   [ Bastian Blank ]
   * [xen] Add SuSE Xen patch.
+  * Only register notifiers in braille console if used, fixes Insert key.
+    (closes: #494374)
 
   [ Stephen R. Marenka ]
   * [m68k] Set CONFIG_ATARI_ETHERNEC=m for atari, since it only works

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/accessibility-braille-notifier-cleanup.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/accessibility-braille-notifier-cleanup.patch	Sun Sep 28 21:36:46 2008
@@ -0,0 +1,46 @@
+From 252b7805384d12c6857b8bebf1a373e327afbec9 Mon Sep 17 00:00:00 2001
+From: Pascal Terjan <pterjan at mandriva.com>
+Date: Wed, 17 Sep 2008 10:51:01 +0200
+Subject: [PATCH] Only register notifiers when the braille console is used.
+
+http://bugzilla.kernel.org/show_bug.cgi?id=11242
+
+Signed-off-by: Pascal Terjan <pterjan at mandriva.com>
+---
+ drivers/accessibility/braille/braille_console.c |   13 ++++---------
+ 1 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/drivers/accessibility/braille/braille_console.c b/drivers/accessibility/braille/braille_console.c
+index 0a5f6b2..d672cfe 100644
+--- a/drivers/accessibility/braille/braille_console.c
++++ b/drivers/accessibility/braille/braille_console.c
+@@ -376,6 +376,8 @@ int braille_register_console(struct console *console, int index,
+ 	console->flags |= CON_ENABLED;
+ 	console->index = index;
+ 	braille_co = console;
++	register_keyboard_notifier(&keyboard_notifier_block);
++	register_vt_notifier(&vt_notifier_block);
+ 	return 0;
+ }
+ 
+@@ -383,15 +385,8 @@ int braille_unregister_console(struct console *console)
+ {
+ 	if (braille_co != console)
+ 		return -EINVAL;
++	unregister_keyboard_notifier(&keyboard_notifier_block);
++	unregister_vt_notifier(&vt_notifier_block);
+ 	braille_co = NULL;
+ 	return 0;
+ }
+-
+-static int __init braille_init(void)
+-{
+-	register_keyboard_notifier(&keyboard_notifier_block);
+-	register_vt_notifier(&vt_notifier_block);
+-	return 0;
+-}
+-
+-console_initcall(braille_init);
+-- 
+1.6.0.2
+

Modified: dists/sid/linux-2.6/debian/patches/series/7
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/7	(original)
+++ dists/sid/linux-2.6/debian/patches/series/7	Sun Sep 28 21:36:46 2008
@@ -1,2 +1,3 @@
 + bugfix/all/ath5-fix-bad-udelay.patch
 - bugfix/arm/disable-ath5k.patch
++ bugfix/all/accessibility-braille-notifier-cleanup.patch