Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-3
+2
-1
drivers/tty/serial/8250/8250_early.c
+2
-1
drivers/tty/serial/8250/8250_early.c
···
193
193
if (options) {
194
194
options++;
195
195
device->baud = simple_strtoul(options, NULL, 0);
196
-
length = min(strcspn(options, " "), sizeof(device->options));
196
+
length = min(strcspn(options, " ") + 1,
197
+
sizeof(device->options));
197
198
strlcpy(device->options, options, length);
198
199
} else {
199
200
device->baud = probe_baud(port);
+1
-1
drivers/tty/serial/Kconfig
+1
-1
drivers/tty/serial/Kconfig
···
277
277
select SERIAL_CORE
278
278
help
279
279
Support for the on-chip UARTs on the NVIDIA Tegra series SOCs
280
-
providing /dev/ttyHS0, 1, 2, 3 and 4 (note, some machines may not
280
+
providing /dev/ttyTHS0, 1, 2, 3 and 4 (note, some machines may not
281
281
provide all of these ports, depending on how the serial port
282
282
are enabled). This driver uses the APB DMA to achieve higher baudrate
283
283
and better performance.
+1
-1
drivers/tty/synclinkmp.c
+1
-1
drivers/tty/synclinkmp.c
···
3478
3478
for ( i = 0; i < info->rx_buf_count; i++ ) {
3479
3479
/* calculate and store physical address of this buffer entry */
3480
3480
info->rx_buf_list_ex[i].phys_entry =
3481
-
info->buffer_list_phys + (i * sizeof(SCABUFSIZE));
3481
+
info->buffer_list_phys + (i * SCABUFSIZE);
3482
3482
3483
3483
/* calculate and store physical address of */
3484
3484
/* next entry in cirular list of entries */