diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/atmel.c | 1 | ||||
-rw-r--r-- | drivers/serial/efi-stdio.c | 5 | ||||
-rw-r--r-- | drivers/serial/serial_efi.c | 5 | ||||
-rw-r--r-- | drivers/serial/serial_stm32.c | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 2f8adc989f..8394273f9f 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -436,6 +436,7 @@ static int atmel_serial_probe(struct device_d *dev) cdev->getc = atmel_serial_getc; cdev->setbrg = atmel_serial_setbaudrate; cdev->set_mode = atmel_serial_set_mode; + cdev->linux_console_name = "ttyAT"; atmel_serial_init_port(cdev); diff --git a/drivers/serial/efi-stdio.c b/drivers/serial/efi-stdio.c index 0703f727e7..2ca89fa4f8 100644 --- a/drivers/serial/efi-stdio.c +++ b/drivers/serial/efi-stdio.c @@ -243,12 +243,13 @@ static int efi_process_key(struct efi_console_priv *priv, const char *inp) return 1; } -static int efi_console_puts(struct console_device *cdev, const char *s) +static int efi_console_puts(struct console_device *cdev, const char *s, + size_t nbytes) { struct efi_console_priv *priv = to_efi(cdev); int n = 0; - while (*s) { + while (nbytes--) { if (*s == 27) { priv->efi_console_buffer[n] = 0; priv->out->output_string(priv->out, diff --git a/drivers/serial/serial_efi.c b/drivers/serial/serial_efi.c index f0a2b22c2b..667d51f622 100644 --- a/drivers/serial/serial_efi.c +++ b/drivers/serial/serial_efi.c @@ -130,13 +130,14 @@ static void efi_serial_putc(struct console_device *cdev, char c) serial->write(serial, &buffersize, &c); } -static int efi_serial_puts(struct console_device *cdev, const char *s) +static int efi_serial_puts(struct console_device *cdev, const char *s, + size_t nbytes) { struct efi_serial_port *uart = to_efi_serial_port(cdev); struct efi_serial_io_protocol *serial = uart->serial; uint32_t control; efi_status_t efiret; - unsigned long buffersize = strlen(s) * sizeof(char); + unsigned long buffersize = nbytes; do { efiret = serial->getcontrol(serial, &control); diff --git a/drivers/serial/serial_stm32.c b/drivers/serial/serial_stm32.c index a84e64e974..4bbfb1eef7 100644 --- a/drivers/serial/serial_stm32.c +++ b/drivers/serial/serial_stm32.c @@ -182,6 +182,7 @@ static int stm32_serial_probe(struct device_d *dev) cdev->getc = stm32_serial_getc; cdev->flush = stm32_serial_flush; cdev->setbrg = stm32_serial_setbaudrate; + cdev->linux_console_name = "ttySTM"; if (dev->device_node) { devname = of_alias_get(dev->device_node); |