diff options
| -rw-r--r-- | drivers/staging/speakup/speakup_dtlk.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/speakup/speakup_dtlk.c b/drivers/staging/speakup/speakup_dtlk.c index f8cb83c9b82e..df31f8bb69ec 100644 --- a/drivers/staging/speakup/speakup_dtlk.c +++ b/drivers/staging/speakup/speakup_dtlk.c @@ -287,7 +287,7 @@ static struct synth_settings *synth_interrogate(struct spk_synth *synth) } t = buf; /* serial number is little endian */ - status.serial_number = t[0] + t[1]*256; + status.serial_number = t[0] + t[1] * 256; t += 2; for (i = 0; *t != '\r'; t++) { status.rom_version[i] = *t; @@ -326,13 +326,13 @@ static int synth_probe(struct spk_synth *synth) speakup_info.port_tts); if ((port_forced & 0xf) != 0xf) pr_info("warning: port base should probably end with f\n"); - if (synth_request_region(speakup_info.port_tts-1, + 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_lpc = speakup_info.port_tts-1; + port_val = inw(speakup_info.port_tts - 1); + synth_lpc = speakup_info.port_tts - 1; } else { for (i = 0; synth_portlist[i]; i++) { if (synth_request_region(synth_portlist[i], @@ -341,7 +341,7 @@ static int synth_probe(struct spk_synth *synth) port_val = inw(synth_portlist[i]) & 0xfbff; if (port_val == 0x107f) { synth_lpc = synth_portlist[i]; - speakup_info.port_tts = synth_lpc+1; + speakup_info.port_tts = synth_lpc + 1; break; } synth_release_region(synth_portlist[i], @@ -359,7 +359,7 @@ static int synth_probe(struct spk_synth *synth) cpu_relax(); /* wait until it's ready */ sp = synth_interrogate(synth); pr_info("%s: %03x-%03x, ROM ver %s, s/n %u, driver: %s\n", - synth->long_name, synth_lpc, synth_lpc+SYNTH_IO_EXTENT - 1, + synth->long_name, synth_lpc, synth_lpc + SYNTH_IO_EXTENT - 1, sp->rom_version, sp->serial_number, synth->version); synth->alive = 1; return 0; @@ -369,7 +369,8 @@ static void dtlk_release(void) { spk_stop_serial_interrupt(); if (speakup_info.port_tts) - synth_release_region(speakup_info.port_tts-1, SYNTH_IO_EXTENT); + synth_release_region(speakup_info.port_tts - 1, + SYNTH_IO_EXTENT); speakup_info.port_tts = 0; } |