summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/mvebu-uart.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2021-05-21 15:59:23 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2021-05-21 15:59:23 -0300
commitf248d687e99da6799a25bbf53ca1350b84d41077 (patch)
treeedb0b90c039e34e838329ca4d96e9888a4ebfa34 /drivers/tty/serial/mvebu-uart.c
parent3b2f17ad1770e51b8b4e68b5069c4f1ee477eff8 (diff)
parent011ff616ffe8df6b86ee54d14a43c8d1a96a6325 (diff)
downloadlinux-f248d687e99da6799a25bbf53ca1350b84d41077.tar.bz2
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To pick up more UAPI updates to sync with tools/. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/tty/serial/mvebu-uart.c')
-rw-r--r--drivers/tty/serial/mvebu-uart.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c
index e0c00a1b0763..51b0ecabf2ec 100644
--- a/drivers/tty/serial/mvebu-uart.c
+++ b/drivers/tty/serial/mvebu-uart.c
@@ -818,9 +818,6 @@ static int mvebu_uart_probe(struct platform_device *pdev)
return -EINVAL;
}
- if (!match)
- return -ENODEV;
-
/* Assume that all UART ports have a DT alias or none has */
id = of_alias_get_id(pdev->dev.of_node, "serial");
if (!pdev->dev.of_node || id < 0)