From 6b99f32aaf89c5b25b2c52468acdc8697b80026f Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Tue, 22 Nov 2011 13:46:23 -0600 Subject: [PATCH] --- yaml --- r: 281079 b: refs/heads/master c: 4afaee1561e207683dbb886b30a842ffcc22e366 h: refs/heads/master i: 281077: beb14e02f05d2e4523211abb05c9cc70e39d4008 281075: d50fc15cfe29b995f3d8f1913e7c672cf59a22f5 281071: cf1f51186d08821fc087e683ce4e323ee8a943e1 v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/main.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b3c8f7f14a63..8aa4faaafebf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebadb730435b74483daedcd59d664a2dccbe3903 +refs/heads/master: 4afaee1561e207683dbb886b30a842ffcc22e366 diff --git a/trunk/drivers/staging/speakup/main.c b/trunk/drivers/staging/speakup/main.c index 8be560458977..c7b03f0ef2dd 100644 --- a/trunk/drivers/staging/speakup/main.c +++ b/trunk/drivers/staging/speakup/main.c @@ -2268,8 +2268,6 @@ static int __init speakup_init(void) set_mask_bits(0, i, 2); set_key_info(key_defaults, key_buf); - if (quiet_boot) - spk_shut_up |= 0x01; /* From here on out, initializations can fail. */ err = speakup_add_virtual_keyboard(); @@ -2292,6 +2290,9 @@ static int __init speakup_init(void) goto error_kobjects; } + if (quiet_boot) + spk_shut_up |= 0x01; + err = speakup_kobj_init(); if (err) goto error_kobjects;