Commit 713b93f1 authored Mar 01, 2017 by Aleksey Makarov Committed by Greg Kroah-Hartman Mar 14, 2017

Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"



The original patch makes the condition always true, so it is wrong.

It masks (but not fixes) the bug described in the commit message
but introduces a regression (no console is selected by SPCR)
in regular (no 'console=ttyAMA') case.

s/||/&&/ would not fix the problem as the root cause was identified
incorrectly.

This reverts commit aea9a80b.

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 4495c08e

drivers/tty/serial/amba-pl011.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2373,7 +2373,7 @@ static int __init pl011_console_match(struct console co, char name, int idx,
		if (strcmp(name, "qdf2400_e44") == 0) {
		pr_info_once("UART: Working around QDF2400 SoC erratum 44");
		qdf2400_e44_present = true;
		} else if (strcmp(name, "pl011") != 0 \|\| strcmp(name, "ttyAMA") != 0) {
		} else if (strcmp(name, "pl011") != 0) {
		return -ENODEV;
		}

Admin message