diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/68360serial.c | 6 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 2 | ||||
-rw-r--r-- | drivers/serial/nwpserial.c | 2 | ||||
-rw-r--r-- | drivers/serial/sn_console.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index 24661cd5e4fb..768612f8e41e 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c | |||
@@ -2649,7 +2649,7 @@ static int __init rs_360_init(void) | |||
2649 | sup->tfcr = SMC_EB; | 2649 | sup->tfcr = SMC_EB; |
2650 | 2650 | ||
2651 | /* Set this to 1 for now, so we get single | 2651 | /* Set this to 1 for now, so we get single |
2652 | * character interrupts. Using idle charater | 2652 | * character interrupts. Using idle character |
2653 | * time requires some additional tuning. | 2653 | * time requires some additional tuning. |
2654 | */ | 2654 | */ |
2655 | sup->mrblr = 1; | 2655 | sup->mrblr = 1; |
@@ -2728,7 +2728,7 @@ static int __init rs_360_init(void) | |||
2728 | up->tfcr = SMC_EB; | 2728 | up->tfcr = SMC_EB; |
2729 | 2729 | ||
2730 | /* Set this to 1 for now, so we get single | 2730 | /* Set this to 1 for now, so we get single |
2731 | * character interrupts. Using idle charater | 2731 | * character interrupts. Using idle character |
2732 | * time requires some additional tuning. | 2732 | * time requires some additional tuning. |
2733 | */ | 2733 | */ |
2734 | up->mrblr = 1; | 2734 | up->mrblr = 1; |
@@ -2886,7 +2886,7 @@ int serial_console_setup( struct console *co, char *options) | |||
2886 | sup->tfcr = SMC_EB; | 2886 | sup->tfcr = SMC_EB; |
2887 | 2887 | ||
2888 | /* Set this to 1 for now, so we get single | 2888 | /* Set this to 1 for now, so we get single |
2889 | * character interrupts. Using idle charater | 2889 | * character interrupts. Using idle character |
2890 | * time requires some additional tuning. | 2890 | * time requires some additional tuning. |
2891 | */ | 2891 | */ |
2892 | sup->mrblr = 1; | 2892 | sup->mrblr = 1; |
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index cd6cf575902e..6016179db533 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
@@ -852,7 +852,7 @@ static void cpm_uart_init_smc(struct uart_cpm_port *pinfo) | |||
852 | */ | 852 | */ |
853 | cpm_set_smc_fcr(up); | 853 | cpm_set_smc_fcr(up); |
854 | 854 | ||
855 | /* Using idle charater time requires some additional tuning. */ | 855 | /* Using idle character time requires some additional tuning. */ |
856 | out_be16(&up->smc_mrblr, pinfo->rx_fifosize); | 856 | out_be16(&up->smc_mrblr, pinfo->rx_fifosize); |
857 | out_be16(&up->smc_maxidl, pinfo->rx_fifosize); | 857 | out_be16(&up->smc_maxidl, pinfo->rx_fifosize); |
858 | out_be16(&up->smc_brklen, 0); | 858 | out_be16(&up->smc_brklen, 0); |
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c index 3c02fa96f282..e65b0d9202a5 100644 --- a/drivers/serial/nwpserial.c +++ b/drivers/serial/nwpserial.c | |||
@@ -81,7 +81,7 @@ nwpserial_console_write(struct console *co, const char *s, unsigned int count) | |||
81 | 81 | ||
82 | uart_console_write(&up->port, s, count, nwpserial_console_putchar); | 82 | uart_console_write(&up->port, s, count, nwpserial_console_putchar); |
83 | 83 | ||
84 | /* wait for transmitter to become emtpy */ | 84 | /* wait for transmitter to become empty */ |
85 | while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0) | 85 | while ((dcr_read(up->dcr_host, UART_LSR) & UART_LSR_THRE) == 0) |
86 | cpu_relax(); | 86 | cpu_relax(); |
87 | 87 | ||
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 9794e0cd3dcc..7e5e5efea4e2 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
@@ -470,7 +470,7 @@ sn_receive_chars(struct sn_cons_port *port, unsigned long flags) | |||
470 | } | 470 | } |
471 | 471 | ||
472 | if (port->sc_port.state) { | 472 | if (port->sc_port.state) { |
473 | /* The serial_core stuffs are initilized, use them */ | 473 | /* The serial_core stuffs are initialized, use them */ |
474 | tty = port->sc_port.state->port.tty; | 474 | tty = port->sc_port.state->port.tty; |
475 | } | 475 | } |
476 | else { | 476 | else { |
@@ -551,11 +551,11 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw) | |||
551 | BUG_ON(!port->sc_is_asynch); | 551 | BUG_ON(!port->sc_is_asynch); |
552 | 552 | ||
553 | if (port->sc_port.state) { | 553 | if (port->sc_port.state) { |
554 | /* We're initilized, using serial core infrastructure */ | 554 | /* We're initialized, using serial core infrastructure */ |
555 | xmit = &port->sc_port.state->xmit; | 555 | xmit = &port->sc_port.state->xmit; |
556 | } else { | 556 | } else { |
557 | /* Probably sn_sal_switch_to_asynch has been run but serial core isn't | 557 | /* Probably sn_sal_switch_to_asynch has been run but serial core isn't |
558 | * initilized yet. Just return. Writes are going through | 558 | * initialized yet. Just return. Writes are going through |
559 | * sn_sal_console_write (due to register_console) at this time. | 559 | * sn_sal_console_write (due to register_console) at this time. |
560 | */ | 560 | */ |
561 | return; | 561 | return; |