Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220258
b: refs/heads/master
c: ef999f1
h: refs/heads/master
v: v3
  • Loading branch information
Tracey Dent authored and Greg Kroah-Hartman committed Oct 9, 2010
1 parent 506a26a commit 3a9629e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 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: 40e5c96b229928b28edd99cdb981ff5e74938d19
refs/heads/master: ef999f10a61cc6efea42fdd9c32647a39fe390e6
4 changes: 2 additions & 2 deletions trunk/drivers/staging/speakup/serialio.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct serial_state *spk_serial_init(int index)
cval |= UART_LCR_EPAR;
if (synth_request_region(ser->port, 8)) {
/* try to take it back. */
printk("Ports not available, trying to steal them\n");
printk(KERN_INFO "Ports not available, trying to steal them\n");
__release_region(&ioport_resource, ser->port, 8);
err = synth_request_region(ser->port, 8);
if (err) {
Expand Down Expand Up @@ -155,7 +155,7 @@ 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 3a9629e

Please sign in to comment.