From 360115ed046d7d2b3a52d56257c3a0d0917a2815 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Fri, 15 Oct 2010 22:13:36 -0500 Subject: [PATCH] --- yaml --- r: 220389 b: refs/heads/master c: baf9ac9ff8864ce9379b1fd2429103ce8c4d7430 h: refs/heads/master i: 220387: 4d70dd887166fac449fd37c4c47c558e7c83c2e9 v: v3 --- [refs] | 2 +- trunk/drivers/staging/speakup/serialio.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d4795bf9ebf9..73c70bb1d897 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1768fbbd96ae1028cc3ffb56aebfa025087a677 +refs/heads/master: baf9ac9ff8864ce9379b1fd2429103ce8c4d7430 diff --git a/trunk/drivers/staging/speakup/serialio.c b/trunk/drivers/staging/speakup/serialio.c index 65772ec3822d..7f3d87bf5927 100644 --- a/trunk/drivers/staging/speakup/serialio.c +++ b/trunk/drivers/staging/speakup/serialio.c @@ -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; } } @@ -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 @@ -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; }