---

yaml --- r: 220341 b: refs/heads/master c: f493144 h: refs/heads/master i: 220339: 3e49438 v: v3
git-mirror · Oct 15, 2010 · b9b5d81 · b9b5d81
1 parent 469c0f9
commit b9b5d81
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28ba8677bcbe9c0365b32d6007a344b49c8c1204
+refs/heads/master: f4931441aeb02bc53a1cfe216e7489b3f960f76f
diff --git a/trunk/drivers/staging/speakup/speakup_apollo.c b/trunk/drivers/staging/speakup/speakup_apollo.c
@@ -38,14 +38,14 @@
 static void do_catch_up(struct spk_synth *synth);
 
 static struct var_t vars[] = {
-	{ CAPS_START, .u.s = {"cap, " }},
-	{ CAPS_STOP, .u.s = {"" }},
-	{ RATE, .u.n = {"@W%d", 6, 1, 9, 0, 0, NULL }},
-	{ PITCH, .u.n = {"@F%x", 10, 0, 15, 0, 0, NULL }},
-	{ VOL, .u.n = {"@A%x", 10, 0, 15, 0, 0, NULL }},
-	{ VOICE, .u.n = {"@V%d", 1, 1, 6, 0, 0, NULL }},
-	{ LANG, .u.n = {"@=%d,", 1, 1, 4, 0, 0, NULL }},
-	{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL }},
+	{ CAPS_START, .u.s = {"cap, " } },
+	{ CAPS_STOP, .u.s = {"" } },
+	{ RATE, .u.n = {"@W%d", 6, 1, 9, 0, 0, NULL } },
+	{ PITCH, .u.n = {"@F%x", 10, 0, 15, 0, 0, NULL } },
+	{ VOL, .u.n = {"@A%x", 10, 0, 15, 0, 0, NULL } },
+	{ VOICE, .u.n = {"@V%d", 1, 1, 6, 0, 0, NULL } },
+	{ LANG, .u.n = {"@=%d,", 1, 1, 4, 0, 0, NULL } },
+	{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
 	V_LAST_VAR
 };
 
@@ -186,9 +186,11 @@ static void do_catch_up(struct spk_synth *synth)
 			delay_time_val = delay_time->u.n.value;
 			spk_unlock(flags);
 			if (spk_serial_out(synth->procspeech))
-				schedule_timeout(msecs_to_jiffies(delay_time_val));
+				schedule_timeout(msecs_to_jiffies
+						 (delay_time_val));
 			else
-				schedule_timeout(msecs_to_jiffies(full_time_val));
+				schedule_timeout(msecs_to_jiffies
+						 (full_time_val));
 			jiff_max = jiffies + jiffy_delta_val;
 		}
 		set_current_state(TASK_RUNNING);