From b9b5d8155d81388e908efa8c90b09c5833dc4675 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Thu, 14 Oct 2010 19:23:48 -0500 Subject: [PATCH] --- yaml --- r: 220341 b: refs/heads/master c: f4931441aeb02bc53a1cfe216e7489b3f960f76f h: refs/heads/master i: 220339: 3e4943802406a57f848a35141cfff252650c0a1c v: v3 --- [refs] | 2 +- .../drivers/staging/speakup/speakup_apollo.c | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 26b8410889f5..09b5c0db0571 100644 --- 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 index 502c0324ad22..00d5cedd00ab 100644 --- 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);