mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 01:40:30 +00:00
Serial driver fixes for 3.12-rc6
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. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iEYEABECAAYFAlJgH5oACgkQMUfUDdst+yn5ywCfU4Xq4jDcUyc3pEoKfX2kkNZk 7a8An2brQo3h20xHsIv2NprgYqCjfZpx =rcEE -----END PGP SIGNATURE----- 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"
This commit is contained in:
commit
7b4a515509
@ -1912,9 +1912,6 @@ static int serial_imx_probe_dt(struct imx_port *sport,
|
|||||||
|
|
||||||
sport->devdata = of_id->data;
|
sport->devdata = of_id->data;
|
||||||
|
|
||||||
if (of_device_is_stdout_path(np))
|
|
||||||
add_preferred_console(imx_reg.cons->name, sport->port.line, 0);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
@ -561,12 +561,13 @@ static int vt8500_serial_probe(struct platform_device *pdev)
|
|||||||
if (!mmres || !irqres)
|
if (!mmres || !irqres)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
if (np)
|
if (np) {
|
||||||
port = of_alias_get_id(np, "serial");
|
port = of_alias_get_id(np, "serial");
|
||||||
if (port >= VT8500_MAX_PORTS)
|
if (port >= VT8500_MAX_PORTS)
|
||||||
port = -1;
|
port = -1;
|
||||||
else
|
} else {
|
||||||
port = -1;
|
port = -1;
|
||||||
|
}
|
||||||
|
|
||||||
if (port < 0) {
|
if (port < 0) {
|
||||||
/* calculate the port id */
|
/* calculate the port id */
|
||||||
|
Loading…
Reference in New Issue
Block a user