Merge tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (7b4a5155) · Commits · 戴 / test

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"

drivers/tty/serial/imx.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1912,9 +1912,6 @@ static int serial_imx_probe_dt(struct imx_port *sport,

		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;
		}
		#else

drivers/tty/serial/vt8500_serial.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -561,12 +561,13 @@ static int vt8500_serial_probe(struct platform_device *pdev)
		if (!mmres \|\| !irqres)
		return -ENODEV;

		if (np)
		if (np) {
		port = of_alias_get_id(np, "serial");
		if (port >= VT8500_MAX_PORTS)
		port = -1;
		else
		} else {
		port = -1;
		}

		if (port < 0) {
		/* calculate the port id */

Admin message