[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240625064128.127-1-ychuang570808@gmail.com>
Date: Tue, 25 Jun 2024 06:41:28 +0000
From: Jacky Huang <ychuang570808@...il.com>
To: dan.carpenter@...aro.org,
gregkh@...uxfoundation.org,
jirislaby@...nel.org
Cc: linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org,
linux-serial@...r.kernel.org,
Jacky Huang <ychuang3@...oton.com>
Subject: [PATCH v4] tty: serial: ma35d1: Add a NULL check for of_node
From: Jacky Huang <ychuang3@...oton.com>
The pdev->dev.of_node can be NULL if the "serial" node is absent.
Add a NULL check to return an error in such cases.
Fixes: 930cbf92db01 ("tty: serial: Add Nuvoton ma35d1 serial driver support")
Reported-by: Dan Carpenter <dan.carpenter@...aro.org>
Closes: https://lore.kernel.org/all/8df7ce45-fd58-4235-88f7-43fe7cd67e8f@moroto.mountain/
Signed-off-by: Jacky Huang <ychuang3@...oton.com>
---
V3 -> V4: Move the version info lines to the correct position.
V2 -> V3: Added the "Reported-by:" line.
V1 -> V2: Added the "Fixes" line.
drivers/tty/serial/ma35d1_serial.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/tty/serial/ma35d1_serial.c b/drivers/tty/serial/ma35d1_serial.c
index 19f0a305cc43..3b4206e815fe 100644
--- a/drivers/tty/serial/ma35d1_serial.c
+++ b/drivers/tty/serial/ma35d1_serial.c
@@ -688,12 +688,13 @@ static int ma35d1serial_probe(struct platform_device *pdev)
struct uart_ma35d1_port *up;
int ret = 0;
- if (pdev->dev.of_node) {
- ret = of_alias_get_id(pdev->dev.of_node, "serial");
- if (ret < 0) {
- dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", ret);
- return ret;
- }
+ if (!pdev->dev.of_node)
+ return -ENODEV;
+
+ ret = of_alias_get_id(pdev->dev.of_node, "serial");
+ if (ret < 0) {
+ dev_err(&pdev->dev, "failed to get alias/pdev id, errno %d\n", ret);
+ return ret;
}
up = &ma35d1serial_ports[ret];
up->port.line = ret;
--
2.34.1
Powered by blists - more mailing lists