]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "tty: serial: pl011: add ttyAMA for matching pl011 console"
authorAleksey Makarov <aleksey.makarov@linaro.org>
Wed, 1 Mar 2017 15:23:02 +0000 (18:23 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Mar 2017 05:04:06 +0000 (14:04 +0900)
commit9bfd0f866bb4a05c17e0c60ccd6a0a2632236fdb
tree982e5cf8d3700929d22dbec74aec86a332367b95
parent55ceed9ca51f612a818b0364948c9379be96a96e
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 e83d807225b75b0fc40462ba83b4b0e5a7da16f3.

Signed-off-by: Aleksey Makarov <aleksey.makarov@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Tested-by: Jayachandran C <jnair@caviumnetworks.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/amba-pl011.c