Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowell...

[karo-tx-linux.git] / drivers / staging / speakup / speakup_acntpc.c

diff --git a/drivers/staging/speakup/speakup_acntpc.c b/drivers/staging/speakup/speakup_acntpc.c
index b6fbf9de1f85d3155672b8c32ea915ffea3c5385..a041441766aa4df2f1943d681140c30379ddd9b3 100644 (file)
--- a/drivers/staging/speakup/speakup_acntpc.c
+++ b/drivers/staging/speakup/speakup_acntpc.c
@@ -113,6 +113,7 @@ static struct spk_synth synth_acntpc = {
        .startup = SYNTH_START,
        .checkval = SYNTH_CHECK,
        .vars = vars,
+       .io_ops = &spk_serial_io_ops,
        .probe = synth_probe,
        .release = accent_release,
        .synth_immediate = synth_immediate,
@@ -196,6 +197,7 @@ static void do_catch_up(struct spk_synth *synth)
                        synth->flush(synth);
                        continue;
                }
+               synth_buffer_skip_nonlatin1();
                if (synth_buffer_empty()) {
                        spin_unlock_irqrestore(&speakup_info.spinlock, flags);
                        break;
@@ -233,7 +235,7 @@ static void do_catch_up(struct spk_synth *synth)
                        delay_time_val = delay_time->u.n.value;
                        spin_unlock_irqrestore(&speakup_info.spinlock, flags);
                        schedule_timeout(msecs_to_jiffies(delay_time_val));
-                       jiff_max = jiffies+jiffy_delta_val;
+                       jiff_max = jiffies + jiffy_delta_val;
                }
        }
        timeout = SPK_XMITR_TIMEOUT;
@@ -259,18 +261,18 @@ static int synth_probe(struct spk_synth *synth)
        if (port_forced) {
                speakup_info.port_tts = port_forced;
                pr_info("probe forced to %x by kernel command line\n",
-                               speakup_info.port_tts);
-               if (synth_request_region(speakup_info.port_tts-1,
-                                       SYNTH_IO_EXTENT)) {
+                       speakup_info.port_tts);
+               if (synth_request_region(speakup_info.port_tts - 1,
+                                        SYNTH_IO_EXTENT)) {
                        pr_warn("sorry, port already reserved\n");
                        return -EBUSY;
                }
-               port_val = inw(speakup_info.port_tts-1);
-               synth_port_control = speakup_info.port_tts-1;
+               port_val = inw(speakup_info.port_tts - 1);
+               synth_port_control = speakup_info.port_tts - 1;
        } else {
                for (i = 0; synth_portlist[i]; i++) {
                        if (synth_request_region(synth_portlist[i],
-                                               SYNTH_IO_EXTENT)) {
+                                                SYNTH_IO_EXTENT)) {
                                pr_warn
                                    ("request_region: failed with 0x%x, %d\n",
                                     synth_portlist[i], SYNTH_IO_EXTENT);
@@ -280,7 +282,7 @@ static int synth_probe(struct spk_synth *synth)
                        if (port_val == 0x53fc) {
                                /* 'S' and out&input bits */
                                synth_port_control = synth_portlist[i];
-                               speakup_info.port_tts = synth_port_control+1;
+                               speakup_info.port_tts = synth_port_control + 1;
                                break;
                        }
                }
@@ -294,7 +296,7 @@ static int synth_probe(struct spk_synth *synth)
                return -ENODEV;
        }
        pr_info("%s: %03x-%03x, driver version %s,\n", synth->long_name,
-               synth_port_control, synth_port_control+SYNTH_IO_EXTENT-1,
+               synth_port_control, synth_port_control + SYNTH_IO_EXTENT - 1,
                synth->version);
        synth->alive = 1;
        return 0;
@@ -302,6 +304,7 @@ static int synth_probe(struct spk_synth *synth)
 
 static void accent_release(void)
 {
+       spk_stop_serial_interrupt();
        if (speakup_info.port_tts)
                synth_release_region(speakup_info.port_tts-1, SYNTH_IO_EXTENT);
        speakup_info.port_tts = 0;