Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1590403
| From | Aleksey Makarov <aleksey.makarov@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" |
| Date | 2017-03-01 16:30 +0100 |
| Message-ID | <tgemt-4Vt-1@gated-at.bofh.it> (permalink) |
| References | <tgbRD-387-13@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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>
---
v3: fix commit message (Robin Murphy)
v2: add Signed-off-by:
drivers/tty/serial/amba-pl011.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index 8789ea423ccf..56f92d7348bf 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -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;
}
--
2.11.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Aleksey Makarov <aleksey.makarov@linaro.org> - 2017-03-01 13:50 +0100
Re: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Aleksey Makarov <aleksey.makarov@linaro.org> - 2017-03-01 14:10 +0100
Re: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Robin Murphy <robin.murphy@arm.com> - 2017-03-01 15:00 +0100
Re: [PATCH] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Robin Murphy <robin.murphy@arm.com> - 2017-03-01 14:20 +0100
[PATCH v3] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Aleksey Makarov <aleksey.makarov@linaro.org> - 2017-03-01 16:30 +0100
[PATCH v2] Revert "tty: serial: pl011: add ttyAMA for matching pl011 console" Aleksey Makarov <aleksey.makarov@linaro.org> - 2017-03-01 17:00 +0100
csiph-web