From c911885b8ad82bdb923f540e334f3fca9db496dc Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Thu, 2 Oct 2008 14:50:13 -0700 Subject: [PATCH] --- yaml --- r: 110131 b: refs/heads/master c: c0c9209ddd96bc4f1d70a8b9958710671e076080 h: refs/heads/master i: 110129: edb780f67ccd9e1f9ef53d14666090fac6f6878d 110127: f50a8d008f25a43db853d4cf594343ca41bafdab v: v3 --- [refs] | 2 +- .../drivers/accessibility/braille/braille_console.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0615f2743206..4f716d4f7a0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16dbc6c9616363fe53811abcbd935336dc0a0f01 +refs/heads/master: c0c9209ddd96bc4f1d70a8b9958710671e076080 diff --git a/trunk/drivers/accessibility/braille/braille_console.c b/trunk/drivers/accessibility/braille/braille_console.c index 0a5f6b2114c5..d672cfe7ca59 100644 --- a/trunk/drivers/accessibility/braille/braille_console.c +++ b/trunk/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);