Bladeren bron

Merge tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial fixes from Greg KH:
 "Here are 3 fixes for TTY and serial issues that have been reported.
  Nothing huge, but nice to get fixed"

* tag 'tty-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: tegra: correct help message in Kconfig from 'ttyHS' to 'ttyTHS'
  tty/8250_early: Don't truncate last character of options
  TTY: snyclinkmp: calculating wrong addresses
Linus Torvalds 12 jaren geleden
bovenliggende
commit
ab20fb8139
3 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. 2 1
      drivers/tty/serial/8250/8250_early.c
  2. 1 1
      drivers/tty/serial/Kconfig
  3. 1 1
      drivers/tty/synclinkmp.c

+ 2 - 1
drivers/tty/serial/8250/8250_early.c

@@ -193,7 +193,8 @@ static int __init parse_options(struct early_serial8250_device *device,
 	if (options) {
 	if (options) {
 		options++;
 		options++;
 		device->baud = simple_strtoul(options, NULL, 0);
 		device->baud = simple_strtoul(options, NULL, 0);
-		length = min(strcspn(options, " "), sizeof(device->options));
+		length = min(strcspn(options, " ") + 1,
+			     sizeof(device->options));
 		strlcpy(device->options, options, length);
 		strlcpy(device->options, options, length);
 	} else {
 	} else {
 		device->baud = probe_baud(port);
 		device->baud = probe_baud(port);

+ 1 - 1
drivers/tty/serial/Kconfig

@@ -277,7 +277,7 @@ config SERIAL_TEGRA
 	select SERIAL_CORE
 	select SERIAL_CORE
 	help
 	help
 	  Support for the on-chip UARTs on the NVIDIA Tegra series SOCs
 	  Support for the on-chip UARTs on the NVIDIA Tegra series SOCs
-	  providing /dev/ttyHS0, 1, 2, 3 and 4 (note, some machines may not
+	  providing /dev/ttyTHS0, 1, 2, 3 and 4 (note, some machines may not
 	  provide all of these ports, depending on how the serial port
 	  provide all of these ports, depending on how the serial port
 	  are enabled). This driver uses the APB DMA to achieve higher baudrate
 	  are enabled). This driver uses the APB DMA to achieve higher baudrate
 	  and better performance.
 	  and better performance.

+ 1 - 1
drivers/tty/synclinkmp.c

@@ -3478,7 +3478,7 @@ static int alloc_buf_list(SLMP_INFO *info)
 	for ( i = 0; i < info->rx_buf_count; i++ ) {
 	for ( i = 0; i < info->rx_buf_count; i++ ) {
 		/* calculate and store physical address of this buffer entry */
 		/* calculate and store physical address of this buffer entry */
 		info->rx_buf_list_ex[i].phys_entry =
 		info->rx_buf_list_ex[i].phys_entry =
-			info->buffer_list_phys + (i * sizeof(SCABUFSIZE));
+			info->buffer_list_phys + (i * SCABUFSIZE);
 
 
 		/* calculate and store physical address of */
 		/* calculate and store physical address of */
 		/* next entry in cirular list of entries */
 		/* next entry in cirular list of entries */