summaryrefslogtreecommitdiff
path: root/drivers/tty/tty_ldisc.c
diff options
context:
space:
mode:
authorAleksey Makarov <aleksey.makarov@linaro.org>2017-03-01 18:23:02 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-17 08:04:06 +0300
commitb767ad726c2aa6219318bf0da83fbe690e653d9a (patch)
tree982e5cf8d3700929d22dbec74aec86a332367b95 /drivers/tty/tty_ldisc.c
parent542ed784671d4678406c77ed6dd01593a0cdbea1 (diff)
downloadlinux-b767ad726c2aa6219318bf0da83fbe690e653d9a.tar.xz
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 aea9a80ba98a0c9b4de88850260e9fbdcc98360b. 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>
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
0 files changed, 0 insertions, 0 deletions