tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull serial driver fixes from Greg KH:
"Here are two serial driver fixes for your tree. One is a revert of a
patch that causes a build error, the other is a fix to provide the
correct brace placement which resolves a bug where the driver was not
working properly"

* tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
serial: vt8500: add missing braces
Revert "serial: i.MX: evaluate linux,stdout-path property"

Linus Torvalds 7b4a5155 66eb411e

+3 -5
-3
drivers/tty/serial/imx.c
··· 1912 1912 1913 1913 sport->devdata = of_id->data; 1914 1914 1915 - if (of_device_is_stdout_path(np)) 1916 - add_preferred_console(imx_reg.cons->name, sport->port.line, 0); 1917 - 1918 1915 return 0; 1919 1916 } 1920 1917 #else
+3 -2
drivers/tty/serial/vt8500_serial.c
··· 561 561 if (!mmres || !irqres) 562 562 return -ENODEV; 563 563 564 - if (np) 564 + if (np) { 565 565 port = of_alias_get_id(np, "serial"); 566 566 if (port >= VT8500_MAX_PORTS) 567 567 port = -1; 568 - else 568 + } else { 569 569 port = -1; 570 + } 570 571 571 572 if (port < 0) { 572 573 /* calculate the port id */