Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220389
b: refs/heads/master
c: baf9ac9
h: refs/heads/master
i:
  220387: 4d70dd8
v: v3
  • Loading branch information
William Hubbs authored and Greg Kroah-Hartman committed Oct 19, 2010
1 parent a2c92b4 commit 360115e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1768fbbd96ae1028cc3ffb56aebfa025087a677
refs/heads/master: baf9ac9ff8864ce9379b1fd2429103ce8c4d7430
9 changes: 6 additions & 3 deletions trunk/drivers/staging/speakup/serialio.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ struct serial_state *spk_serial_init(int index)
__release_region(&ioport_resource, ser->port, 8);
err = synth_request_region(ser->port, 8);
if (err) {
pr_warn("Unable to allocate port at %lx, errno %i", ser->port, err);
pr_warn("Unable to allocate port at %lx, errno %i",
ser->port, err);
return NULL;
}
}
Expand Down Expand Up @@ -134,7 +135,8 @@ int wait_for_xmitr(void)
{
int tmout = SPK_XMITR_TIMEOUT;
if ((synth->alive) && (timeouts >= NUM_DISABLE_TIMEOUTS)) {
pr_warn("%s: too many timeouts, deactivating speakup\n", synth->long_name);
pr_warn("%s: too many timeouts, deactivating speakup\n",
synth->long_name);
synth->alive = 0;
/* No synth any more, so nobody will restart TTYs, and we thus
* need to do it ourselves. Now that there is no synth we can
Expand All @@ -155,7 +157,8 @@ int wait_for_xmitr(void)
while (!((inb_p(speakup_info.port_tts + UART_MSR)) & UART_MSR_CTS)) {
/* CTS */
if (--tmout == 0) {
/* pr_warn("%s: timed out (cts)\n", synth->long_name); */
/* pr_warn("%s: timed out (cts)\n",
* synth->long_name); */
timeouts++;
return 0;
}
Expand Down

0 comments on commit 360115e

Please sign in to comment.