---

yaml --- r: 281079 b: refs/heads/master c: 4afaee1 h: refs/heads/master i: 281077: beb14e0 281075: d50fc15 281071: cf1f511 v: v3
git-mirror · Nov 27, 2011 · 6b99f32 · 6b99f32
1 parent ca5ed1f
commit 6b99f32
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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;